Skip to content

Commit

Permalink
Fix force push to develop on master hotfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
bdmendes committed Sep 1, 2023
1 parent decfdcc commit c048910
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
on:
push:
branches: [ master, develop ]
branches: [master, develop]

jobs:
bump_version:
permissions:
actions: "write"
name: "Bump pubspec version"
runs-on: ubuntu-latest
env:
Expand All @@ -29,6 +31,16 @@ jobs:
with:
commit_message: "Bump app version [no ci]"

- name: Cancel run if on master and does not match develop (e.g due to hotfix)
if: github.ref == 'refs/heads/master'
run: |
git fetch origin develop
if [[ $(git diff --quiet HEAD origin/develop) ]]; then
echo "Master version does not match develop version"
gh run cancel ${{ github.run_id }}
gh run watch ${{ github.run_id }}
fi
- name: Propagate master version bump to develop
if: github.ref == 'refs/heads/master'
run: git push --force-with-lease origin HEAD:develop
Expand All @@ -49,7 +61,7 @@ jobs:
- uses: actions/setup-java@v3
with:
java-version: ${{env.JAVA_VERSION}}
distribution: 'zulu'
distribution: "zulu"
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
Expand Down

0 comments on commit c048910

Please sign in to comment.