-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
6 additions
and
6 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 |
---|---|---|
|
@@ -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 | ||
|
@@ -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 |