Skip to content

ci: update workflow to add upstream remote for fetching branches #577

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
colinaaa merged 9 commits into from
Apr 17, 2025
Merged

ci: update workflow to add upstream remote for fetching branches #577

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f579678
ci: update workflow to add upstream remote for fetching branches
colinaaa Apr 17, 2025
2b169c4
upstream
colinaaa Apr 17, 2025
301911c
fix: repositoryUrl
colinaaa Apr 17, 2025
c430ca4
fix: use `https://`
colinaaa Apr 17, 2025
a96895f
fix: should fetch head ref from origin
colinaaa Apr 17, 2025
652749d
fix: github.repository
colinaaa Apr 17, 2025
17bfaf0
retry
colinaaa Apr 17, 2025
5e4667f
Merge branch 'main' into colin/0417/fetch
colinaaa Apr 17, 2025
1a0bdad
Update .github/workflows/workflow-build.yml
colinaaa Apr 17, 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
9 changes: 6 additions & 3 deletions .github/workflows/workflow-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,15 @@ jobs:
env:
CLEAN_BASE_REF: ${{ steps.git-refs.outputs.base-ref }}
CLEAN_HEAD_REF: ${{ steps.git-refs.outputs.head-ref }}
UPSTREAM_REMOTE: ${{ github.server_url }}/${{ github.repository }}
run: |
git fetch --progress --depth=1 origin "+refs/heads/$CLEAN_BASE_REF:refs/heads/$CLEAN_BASE_REF"
git remote add upstream $UPSTREAM_REMOTE
git fetch --progress --depth=1 upstream "+refs/heads/$CLEAN_BASE_REF:refs/heads/$CLEAN_BASE_REF"
MAX_ATTEMPTS=10
ATTEMPT=0
while [ -z "$( git merge-base "refs/heads/$CLEAN_BASE_REF" "$CLEAN_HEAD_REF" )" ] && [ "$ATTEMPT" -lt "$MAX_ATTEMPTS" ]; do
git fetch -q --deepen=10 origin "refs/heads/$CLEAN_BASE_REF" "$CLEAN_HEAD_REF"
git fetch -q --deepen=10 upstream "refs/heads/$CLEAN_BASE_REF"
git fetch -q --deepen=10 origin "$CLEAN_HEAD_REF"
ATTEMPT=$((ATTEMPT + 1))
done
if [ "$ATTEMPT" -ge "$MAX_ATTEMPTS" ]; then
Expand All @@ -52,7 +55,7 @@ jobs:
- name: Get merge base
id: merge-base
env:
CLEAN_BASE_REF: ${{ format('origin/{0}', steps.git-refs.outputs.base-ref) || github.event.base }}
CLEAN_BASE_REF: ${{ format('upstream/{0}', steps.git-refs.outputs.base-ref) || github.event.base }}
CLEAN_HEAD_REF: ${{ steps.git-refs.outputs.head-ref }}
run: |
echo "merge-base=$(git merge-base "$CLEAN_BASE_REF" "$CLEAN_HEAD_REF" || git rev-parse "$CLEAN_BASE_REF")" >> $GITHUB_OUTPUT
Expand Down
Loading