Skip to content

Commit

Permalink
Dont use updateProtectedBranch from createNewVersion
Browse files Browse the repository at this point in the history
  • Loading branch information
roryabraham committed Jun 15, 2023
1 parent 3aa0723 commit 4cb2058
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions .github/workflows/createNewVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ github.token }}

- name: Create new branch
run: |
git pull
BRANCH_NAME="version-${{ inputs.SEMVER_LEVEL }}-$(uuidgen)"
git checkout -b "$BRANCH_NAME"
git push --set-upstream origin "$BRANCH_NAME"
echo "VERSION_BRANCH=$BRANCH_NAME" >> "$GITHUB_ENV"
- run: git pull

- name: Generate version
id: bumpVersion
Expand All @@ -85,15 +79,9 @@ jobs:
./ios/NewExpensify/Info.plist \
./ios/NewExpensifyTests/Info.plist
git commit -m "Update version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}"
git push origin ${{ env.VERSION_BRANCH }}
- name: Update main branch
uses: Expensify/App/.github/actions/composite/updateProtectedBranch@main
with:
TARGET_BRANCH: main
SOURCE_BRANCH: ${{ env.VERSION_BRANCH }}
OS_BOTIFY_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
run: git push origin main

- if: ${{ failure() }}
uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
Expand Down

0 comments on commit 4cb2058

Please sign in to comment.