From 1cc9c3dd292eeef6b3161e4f7340c1985728c657 Mon Sep 17 00:00:00 2001 From: kennyAgricultureVic Date: Wed, 18 Dec 2024 17:16:44 +1100 Subject: [PATCH] auto update determined to be no longer needed. Updated to perform a manual reset of the branch --- ...ch.yml => repo__manual-reset-param-branch.yml} | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) rename .github/workflows/{repo__auto-update-param-branch.yml => repo__manual-reset-param-branch.yml} (50%) diff --git a/.github/workflows/repo__auto-update-param-branch.yml b/.github/workflows/repo__manual-reset-param-branch.yml similarity index 50% rename from .github/workflows/repo__auto-update-param-branch.yml rename to .github/workflows/repo__manual-reset-param-branch.yml index fa709e1..a923449 100644 --- a/.github/workflows/repo__auto-update-param-branch.yml +++ b/.github/workflows/repo__manual-reset-param-branch.yml @@ -1,22 +1,19 @@ -name: repo__auto-update-param-branch +name: repo__manual-reset-param-branch on: - push: - branches: - - main # Trigger on pushes to main branch workflow_dispatch: # Allow manual triggering jobs: - auto-merge: + reset: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Merge develop -> test-space/pk + - name: Reset test-space/pk to develop run: | git config user.name github-actions git config user.email github-actions@github.com - git checkout develop - git rebase origin/develop - git push --force-with-lease origin develop + git checkout test-space/pk + git reset --hard origin/develop + git push --force-with-lease origin test-space/pk