From d9b6e1e124a813533631caa0a375ccd0c3bf4e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Walter?= Date: Sun, 9 Jul 2023 18:21:55 +0200 Subject: [PATCH] Add git branch in workflow --- .github/workflows/deployments_staging.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deployments_staging.yml b/.github/workflows/deployments_staging.yml index 43d4c04..ca8bb06 100644 --- a/.github/workflows/deployments_staging.yml +++ b/.github/workflows/deployments_staging.yml @@ -18,12 +18,13 @@ jobs: run: | git config user.name "${{ github.actor }}" git config user.email "${{ github.actor }}@users.noreply.github.com" + git fetch origin testnet git checkout testnet - git merge staging --no-edit - git push + git reset staging --hard + git push origin testnet -f merge-testnet2: - name: Merge Staging to Testnet + name: Merge Staging to Testnet2 runs-on: ubuntu-latest steps: @@ -34,9 +35,10 @@ jobs: run: | git config user.name "${{ github.actor }}" git config user.email "${{ github.actor }}@users.noreply.github.com" + git fetch origin testnet2 git checkout testnet2 - git merge staging --no-edit - git push + git reset staging --hard + git push origin testnet2 -f merge-goerli: name: Merge Staging to Goerli @@ -50,6 +52,7 @@ jobs: run: | git config user.name "${{ github.actor }}" git config user.email "${{ github.actor }}@users.noreply.github.com" + git fetch origin goerli git checkout goerli - git merge staging --no-edit - git push + git reset staging --hard + git push origin goerli -f