From a95704566b3f1848e4e1a25b28991a6e5c0e60a4 Mon Sep 17 00:00:00 2001 From: DinizSa Date: Fri, 21 Feb 2025 18:08:27 +0000 Subject: [PATCH] chore: ammend --- .github/workflows/booster.yaml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/booster.yaml b/.github/workflows/booster.yaml index 25de99d2..97ddb40e 100644 --- a/.github/workflows/booster.yaml +++ b/.github/workflows/booster.yaml @@ -34,10 +34,11 @@ jobs: - name: Install dependencies run: npm install - - name: Switch to target branch for data + - name: Git config run: | - git fetch origin - git checkout -B $BOOST_DATA_BRANCH + git config --global user.name "github-actions[bot]" + git config --global user.email "github-actions[bot]@users.noreply.github.com" + git config --global push.autoSetupRemote true - name: Boost backers' rewards run: | @@ -45,13 +46,20 @@ jobs: --boost=${{ github.event.inputs.boost }} \ --nft=${{ github.event.inputs.nft }} \ --env=${{ github.event.inputs.env }} + + git add . + git stash push -m "Generated JSON from A" - - name: Commit and push changes + - name: Switch to target branch for data run: | - git config --global user.name "github-actions[bot]" - git config --global user.email "github-actions[bot]@users.noreply.github.com" - git config --global push.autoSetupRemote true + git fetch origin + git checkout -B $BOOST_DATA_BRANCH + + git stash apply || echo "No stash to apply" + git checkout --theirs . + - name: Commit and push changes + run: | # Stage all changes git add .