Skip to content

Commit

Permalink
auto update determined to be no longer needed. Updated to perform a m…
Browse files Browse the repository at this point in the history
…anual reset of the branch
  • Loading branch information
kennyAgricultureVic committed Dec 18, 2024
1 parent 2b79c29 commit 1cc9c3d
Showing 1 changed file with 6 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -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 [email protected]
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

0 comments on commit 1cc9c3d

Please sign in to comment.