From e75fa8f768a8ad38f3afeeab3b73afaa994df252 Mon Sep 17 00:00:00 2001 From: mukulmishra18 Date: Wed, 27 Dec 2023 17:53:00 +0530 Subject: [PATCH] Use temp branch for testing --- .github/workflows/merge.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index e70c75f48..dcdc0e8b7 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -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: | @@ -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'); @@ -83,4 +85,3 @@ jobs: execSync(`git config --global user.name 'Automated Release'`); execSync(`git config --global user.email 'release-automation@bitmovin.com'`); execSync(`git tag -a ${tag} -m "${message}"`); - execSync(`git push --set-upstream origin develop ${tag}`);