Skip to content

Commit

Permalink
[RELEASE] Fix tangle-dapp v0.0.14 release
Browse files Browse the repository at this point in the history
  • Loading branch information
AtelyPham committed Sep 20, 2024
1 parent cc6b042 commit 1bd5427
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/auto-sync-master-with-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
app-id: ${{ vars.AUTO_SYNC_BRANCHES_APP_ID }}
private-key: ${{ secrets.AUTO_SYNC_BRANCHES_SECRET }}

- name: Checkout Develop
- name: Checkout Master
uses: actions/checkout@v4
with:
ref: develop
ref: master
fetch-depth: 0
token: ${{ steps.app-token.outputs.token }}

Expand All @@ -33,15 +33,12 @@ jobs:
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
- name: Checkout Master and Fast-Forward Merge
- name: Merge Release Commit to Master
run: |
git checkout develop
git fetch origin
git checkout master
git pull
git merge --ff-only origin/develop
git fetch origin develop
git merge --ff-only ${{ github.sha }}
- name: Push Changes to Master
run: git push origin master --force-with-lease
run: git push origin master
env:
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

0 comments on commit 1bd5427

Please sign in to comment.