Browse Source

Resolve current branch on release job

master
Rory Powell 5 years ago
parent
commit
732ba40ff6
  1. 4
      .github/workflows/budibase_ci.yml
  2. 3
      .github/workflows/release-develop.yml

4
.github/workflows/budibase_ci.yml

@ -13,7 +13,7 @@ on:
- develop - develop
env: env:
branch: ${{ github.event.pull_request.head.ref }} BRANCH: ${{ github.event.pull_request.head.ref }}
jobs: jobs:
build: build:
@ -36,7 +36,7 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
repository: budibase/budibase-pro repository: budibase/budibase-pro
ref: ${{ env.branch }} ref: ${{ env.BRANCH }}
path: './pro' path: './pro'
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
- name: Setup pro - name: Setup pro

3
.github/workflows/release-develop.yml

@ -20,6 +20,7 @@ env:
POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }} POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}
INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }} INTERCOM_TOKEN: ${{ secrets.INTERCOM_TOKEN }}
POSTHOG_URL: ${{ secrets.POSTHOG_URL }} POSTHOG_URL: ${{ secrets.POSTHOG_URL }}
BRANCH: ${{ github.event.pull_request.head.ref }}
jobs: jobs:
release: release:
@ -36,7 +37,7 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
repository: budibase/budibase-pro repository: budibase/budibase-pro
ref: ${{ env.branch }} ref: ${{ env.BRANCH }}
path: './pro' path: './pro'
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
- name: Setup pro - name: Setup pro

Loading…
Cancel
Save