Skip to content

Commit

Permalink
Merge branch 'feature/automate-release-on-merge' into feature/test-au…
Browse files Browse the repository at this point in the history
…tomated-release
  • Loading branch information
mukulmishra18 committed Dec 27, 2023
2 parents 7e9e230 + e75fa8f commit b3034e7
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ jobs:
- name: Checkout develop
uses: actions/checkout@v2
with:
ref: develop
# For testing checkout to a temp branch, will be changed to develop
ref: feature/test-automated-release
token: ${{ secrets.GH_TOKEN }}
- name: Bump package.json version
run: |
Expand Down Expand Up @@ -66,10 +67,11 @@ jobs:
run: |
git add .
git commit -m "Bump version ${{ outputs.full-release-version }} and update changelog"
git push --set-upstream origin develop
git push origin feature/test-automated-release
- name: Tag and push
uses: actions/github-script@v6
# Tag push should happen without a token, otherwise it will not trigger release workflow
# DO NOT PUSH TAG FOR TESTING
with:
script: |
const { execSync } = require('child_process');
Expand All @@ -83,4 +85,3 @@ jobs:
execSync(`git config --global user.name 'Automated Release'`);
execSync(`git config --global user.email '[email protected]'`);
execSync(`git tag -a ${tag} -m "${message}"`);
execSync(`git push --set-upstream origin develop ${tag}`);

0 comments on commit b3034e7

Please sign in to comment.