Skip to content
This repository was archived by the owner on Oct 20, 2025. It is now read-only.

Commit 0acaa43

Browse files
committed
Refactor GitHub Actions workflow to streamline main branch updates
1 parent 45ee002 commit 0acaa43

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,11 @@ jobs:
5858

5959
- name: Push changes to main
6060
run: |
61-
git config --global user.email "[email protected]"
62-
git config --global user.name "dconco"
63-
64-
git fetch origin main dev # Fetch only main and dev branches
61+
git fetch origin main dev
6562
git checkout main
6663
git config pull.rebase false
67-
git pull origin main # Get latest changes on main
68-
69-
# Now merge dev into main, allowing unrelated histories if necessary
64+
git pull origin main
7065
git merge origin/dev --allow-unrelated-histories --no-ff
71-
72-
# Push to main
7366
git push origin main
7467
env:
7568
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)