Skip to content

Commit

Permalink
ci(sync.yml): tryna fix +1
Browse files Browse the repository at this point in the history
  • Loading branch information
iahmadgad authored Dec 13, 2024
1 parent 91b43aa commit c6a38ef
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
- name: Checkout the repository
uses: actions/checkout@v4
with:
ref: dev
fetch-depth: 0 # Fetch full history, including tags

- name: Sync dev with main
run: |
git config --global user.name "GitHub Actions"
git config --global user.email "[email protected]"
git checkout -- dev
git merge main
git push -u origin -- dev
git push -u origin dev
gitlab-mirror:
name: Sync GitLab Mirror
Expand All @@ -34,17 +34,17 @@ jobs:
with:
fetch-depth: 0 # Fetch full history, including tags

- name: Mirror to GitLab
- name: Push to GitLab mirror
env:
GITLAB_URL: gitlab.com/iahmagad/termux-clock.git
GITLAB_URL: gitlab.com/iahmadgad/termux-clock.git
GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
run: |
git remote add gitlab "$GITLAB_URL"
git config --global user.name "GitHub Actions"
git config --global user.email "[email protected]"
# Push main and dev branches
git push https://oauth2:$GITLAB_TOKEN@$GITLAB_URL main
# Push main branch
git push https://oauth2:$GITLAB_TOKEN@$GITLAB_URL main --force
# Push tags associated with these branches
git push https://oauth2:$GITLAB_TOKEN@$GITLAB_URL --tags

0 comments on commit c6a38ef

Please sign in to comment.