Skip to content

fix: CD properly detect release branch #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dOrgJelli merged 1 commit into from
Nov 4, 2022
Merged

fix: CD properly detect release branch #1387

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions .github/workflows/release-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,17 @@ jobs:
github.event.comment.user.login != 'polywrap-build-bot'
runs-on: ubuntu-18.04
steps:
- name: Get Release Branch
run: |
releaseBranch="$(gh api /repos/polywrap/toolchain/pulls/${github.event.issue.number} --jq '.base.ref')"
echo 'RELEASE_BRANCH='$releaseBranch >> $GITHUB_ENV
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@3.1.0
with:
ref: ${{ github.event.pull_request.head.ref }}
ref: $RELEASE_BRANCH

- name: Commenter Is Publisher?
run: |
Expand Down Expand Up @@ -81,10 +88,17 @@ jobs:
needs: Pre-Check
runs-on: ubuntu-18.04
steps:
- name: Get Release Branch
run: |
releaseBranch="$(gh api /repos/polywrap/toolchain/pulls/${github.event.issue.number} --jq '.base.ref')"
echo 'RELEASE_BRANCH='$releaseBranch >> $GITHUB_ENV
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@3.1.0
with:
ref: ${{ github.event.pull_request.head.ref }}
ref: $RELEASE_BRANCH

- name: Set env.BOT to Build Bot's Username
run: echo BOT=polywrap-build-bot >> $GITHUB_ENV
Expand Down Expand Up @@ -143,7 +157,7 @@ jobs:
token: ${{ secrets.POLYWRAP_BUILD_BOT_PAT }}
push-to-fork: ${{env.BOT}}/${{github.event.repository.name}}
branch: release/origin-${{env.RELEASE_VERSION}}
base: ${{ github.event.pull_request.head.ref }}
base: $RELEASE_BRANCH
committer: GitHub <noreply@github.com>
author: ${{env.BOT}} <${{env.BOT}}@users.noreply.github.com>
commit-message: "${{env.RELEASE_VERSION}}"
Expand Down