Skip to content

ci: update tag upstream sync #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 21, 2025
Merged

ci: update tag upstream sync #17

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0152e4c
ci: update tag
Minh141120 Mar 21, 2025
64718dd
chore: pull request to dev
Minh141120 Mar 21, 2025
3213416
chore: update ci upstream sync
Minh141120 Mar 21, 2025
b4b9eb3
refactor: remove pull request to dev for testing
Minh141120 Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/upstream-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
git checkout -B master FETCH_HEAD
git push origin master --force

# Count commits for tagging
# Count commits for tagging - this is the master branch commit count
COMMIT_COUNT=$(git rev-list --count HEAD)
echo "COMMIT_COUNT=$COMMIT_COUNT" >> $GITHUB_ENV

Expand All @@ -64,6 +64,10 @@ jobs:

BRANCH_NAME="update-dev-from-master-$(date +'%Y-%m-%d-%H-%M')"
git checkout -b $BRANCH_NAME

# Make sure branch contains master content before creating the PR
git merge --no-edit master

git push origin $BRANCH_NAME --force

PR_TITLE="Sync master with upstream release $LATEST_TAG"
Expand Down Expand Up @@ -144,10 +148,12 @@ jobs:

echo "PR merged successfully!"

# Create tag
# Create tag using master branch commit count
TAG_NAME="$COMMIT_COUNT"

# Checkout dev to apply the tag
git fetch origin dev
git checkout dev
TAG_NAME="b$COMMIT_COUNT"

# Check if tag exists
if git rev-parse "$TAG_NAME" >/dev/null 2>&1; then
Expand Down