From 8dbaba45dc5f6f3018821d2f8bf788524c9ba508 Mon Sep 17 00:00:00 2001 From: Isabel Fenton Date: Wed, 7 Aug 2024 13:05:36 +0100 Subject: [PATCH] Bug fix for frontend workflow (#708) * Updating to run on separate branch * Updating to run on separate branch * fixing error with git pull * auto-update via GH Action * Catalog validation (#704) (#705) * Updating to run on separate branch * Updating to run on separate branch * fixing error with git pull * auto-update via GH Action * Updating frontend action * Updating github action * Updating github action * Updating github action * Updating github action * Updating github action * Updating github action --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/workflows/frontend.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 22bcd56f..fc8f1ef9 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -4,15 +4,26 @@ on: [push, pull_request] jobs: build-and-deploy-if-main: runs-on: ubuntu-latest + permissions: + contents: write steps: - name: Checkout uses: actions/checkout@v4 with: ref: catalog-validation + fetch-depth: 0 + + - name: Update branch + run: | + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git checkout main + git fetch origin + git checkout catalog-validation + git pull + git merge origin/main + git push origin catalog-validation - - name: Pull changes from main - run: git config pull.rebase true - - name: Install node uses: actions/setup-node@v4 with: