-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
auto update determined to be no longer needed. Updated to perform a m…
…anual reset of the branch
- Loading branch information
1 parent
2b79c29
commit 1cc9c3d
Showing
1 changed file
with
6 additions
and
9 deletions.
There are no files selected for viewing
15 changes: 6 additions & 9 deletions
15
...kflows/repo__auto-update-param-branch.yml → ...flows/repo__manual-reset-param-branch.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |