-
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.
Make each step its own job in hash job 5
- Loading branch information
Xavier Metichecchia
authored and
Xavier Metichecchia
committed
Jan 6, 2025
1 parent
0faeb35
commit 99a7f48
Showing
1 changed file
with
30 additions
and
28 deletions.
There are no files selected for viewing
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 |
---|---|---|
|
@@ -67,37 +67,39 @@ jobs: | |
# Switch to the main branch | ||
git checkout main | ||
git submodule update --remote --merge | ||
# Pull changes from release into main | ||
git pull origin release | ||
# Push updated main branch | ||
git push origin main | ||
update-submodule-on-dev: | ||
name: update-submodule-on-dev | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- name: Checkout repository without submodules | ||
uses: actions/checkout@v4 | ||
with: | ||
# submodules: false # Do not checkout submodules initially | ||
fetch-depth: 0 # Fetch all history | ||
|
||
- name: Set up Git | ||
run: | | ||
git config --global user.name "Xavier Metichecchia" | ||
git config --global user.email "[email protected]" | ||
git config --global pull.rebase false # Ensure merge strategy | ||
git remote set-url origin https://${{ secrets.HASH_PAT }}@github.com/GSA/px-benefit-finder.git | ||
- name: Sync release to dev | ||
run: | | ||
# Switch to the dev branch | ||
git checkout dev | ||
# Pull changes from release into dev | ||
git pull origin release | ||
# Push updated dev branch | ||
git push origin dev | ||
# update-submodule-on-dev: | ||
# name: update-submodule-on-dev | ||
# runs-on: ubuntu-latest | ||
# | ||
# steps: | ||
# - name: Checkout repository without submodules | ||
# uses: actions/checkout@v4 | ||
# with: | ||
# # submodules: false # Do not checkout submodules initially | ||
# fetch-depth: 0 # Fetch all history | ||
# | ||
# - name: Set up Git | ||
# run: | | ||
# git config --global user.name "Xavier Metichecchia" | ||
# git config --global user.email "[email protected]" | ||
# git config --global pull.rebase false # Ensure merge strategy | ||
# git remote set-url origin https://${{ secrets.HASH_PAT }}@github.com/GSA/px-benefit-finder.git | ||
# | ||
# - name: Sync release to dev | ||
# run: | | ||
# # Switch to the dev branch | ||
# git checkout dev | ||
# | ||
# # Pull changes from release into dev | ||
# git pull origin release | ||
# | ||
# # Push updated dev branch | ||
# git push origin dev |