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 569aed1
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 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 Down Expand Up @@ -31,7 +33,14 @@ jobs:

- name: Propagate master version bump to develop
if: github.ref == 'refs/heads/master'
run: git push --force-with-lease origin HEAD:develop
run: |
git fetch origin develop
if [[ $(git diff --quiet HEAD~1 origin/develop) ]]; then
echo "Master version does not match develop version"
else
echo "Master version matches develop version"
git push --force-with-lease origin HEAD:develop
fi
build:
name: "Build App Bundle"
Expand All @@ -49,7 +58,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 569aed1

Please sign in to comment.