Skip to content

ci: avoid fetch error on push event #567

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 2 commits into from
Apr 16, 2025
Merged

ci: avoid fetch error on push event #567

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c52a89
ci: avoid fetch error on push event
colinaaa Apr 16, 2025
fdd5a06
ci: missing CLEAN_BASE_REF
colinaaa Apr 16, 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: 6 additions & 6 deletions .github/workflows/workflow-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ jobs:
get-merge-base:
runs-on: lynx-ubuntu-24.04-medium
env:
# We have 3 cases:
# We have 2 cases:
# 1. Pull request
# 2. Merge group
# 3. Push (deploy on main branch)
BASE_REF: ${{ github.base_ref || github.event.merge_group.base_ref || github.event.push.base_ref }}
HEAD_REF: ${{ github.head_ref || github.event.merge_group.head_ref || github.ref }}
BASE_REF: ${{ github.base_ref || github.event.merge_group.base_ref }}
HEAD_REF: ${{ github.head_ref || github.event.merge_group.head_ref }}
outputs:
merge-base: ${{ steps.merge-base.outputs.merge-base }}
steps:
Expand All @@ -34,6 +33,7 @@ jobs:
echo "head-ref=$HEAD_REF_CLEAN" >> $GITHUB_OUTPUT
# Modified from https://github.com/rmacklin/fetch-through-merge-base
- name: Fetch
if: github.event_name != 'push'
env:
CLEAN_BASE_REF: ${{ steps.git-refs.outputs.base-ref }}
CLEAN_HEAD_REF: ${{ steps.git-refs.outputs.head-ref }}
Expand All @@ -52,10 +52,10 @@ jobs:
- name: Get merge base
id: merge-base
env:
CLEAN_BASE_REF: ${{ steps.git-refs.outputs.base-ref }}
CLEAN_BASE_REF: ${{ format('origin/{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 "origin/$CLEAN_BASE_REF" "$CLEAN_HEAD_REF" || git rev-parse origin/"$CLEAN_BASE_REF")" >> $GITHUB_OUTPUT
echo "merge-base=$(git merge-base "$CLEAN_BASE_REF" "$CLEAN_HEAD_REF" || git rev-parse "$CLEAN_BASE_REF")" >> $GITHUB_OUTPUT
build-all:
runs-on: lynx-ubuntu-24.04-xlarge
needs: get-merge-base
Expand Down
Loading