Skip to content

Commit 03fc8ca

Browse files
authored
Use main branch for C ABI baseline (#2388)
This is the opposite of the changes here #2331 Closes #2387 Authors: - James Bourbeau (https://github.com/jrbourbeau) Approvers: - Corey J. Nolet (https://github.com/cjnolet) - James Lamb (https://github.com/jameslamb) URL: #2388
1 parent b85c561 commit 03fc8ca

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/check-c-abi.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
- name: Find merge base commit
3232
id: merge-base
3333
run: |
34-
git fetch origin release/26.08
35-
MERGE_BASE=$(git merge-base HEAD origin/release/26.08)
34+
git fetch origin main
35+
MERGE_BASE=$(git merge-base HEAD origin/main)
3636
echo "merge_base_sha=${MERGE_BASE}" >> $GITHUB_OUTPUT
3737
echo "Merge base commit: ${MERGE_BASE}"
3838
@@ -46,40 +46,40 @@ jobs:
4646
commit: ${{ steps.merge-base.outputs.merge_base_sha }}
4747
path: baseline/
4848

49-
- name: Try to download latest release/26.08 baseline (fallback 1)
49+
- name: Try to download latest main baseline (fallback 1)
5050
id: download-main
5151
if: steps.download-merge-base.outcome == 'failure'
5252
continue-on-error: true
5353
uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927 # v19
5454
with:
55-
name: c-abi-baseline-release/26.08
55+
name: c-abi-baseline-main
5656
workflow: check-c-abi.yaml
57-
branch: release/26.08
57+
branch: main
5858
path: baseline/
5959

60-
- name: Extract baseline ABI from release/26.08 branch (fallback 2)
60+
- name: Extract baseline ABI from main branch (fallback 2)
6161
if: steps.download-merge-base.outcome == 'failure' && steps.download-main.outcome == 'failure'
6262
run: |
63-
echo "⚠️ No baseline artifacts found, extracting from release/26.08 branch..."
63+
echo "⚠️ No baseline artifacts found, extracting from main branch..."
6464
echo "This is slower but ensures we always have a baseline for comparison."
65-
git worktree add ../cuvs-release-26.08 origin/release/26.08
65+
git worktree add ../cuvs-main origin/main
6666
mkdir -p baseline
6767
check-c-abi extract \
68-
--header-path ../cuvs-release-26.08/c/include \
68+
--header-path ../cuvs-main/c/include \
6969
--include-file cuvs/core/all.h \
7070
--output-file baseline/c_abi.json.gz \
7171
--dlpack-include-path dlpack/include
7272
73-
echo "✓ Baseline ABI extracted from release/26.08 branch"
73+
echo "✓ Baseline ABI extracted from main branch"
7474
7575
- name: Report baseline source
7676
run: |
7777
if [ "$DOWNLOAD_MERGE_BASE_OUTCOME" == "success" ]; then
7878
echo "✓ Using baseline from merge-base commit: $MERGE_BASE_SHA"
7979
elif [ "$DOWNLOAD_MAIN_OUTCOME" == "success" ]; then
80-
echo "✓ Using latest release/26.08 baseline (merge-base baseline not yet available)"
80+
echo "✓ Using latest main baseline (merge-base baseline not yet available)"
8181
else
82-
echo "✓ Using freshly extracted baseline from release/26.08 branch"
82+
echo "✓ Using freshly extracted baseline from main branch"
8383
fi
8484
env:
8585
DOWNLOAD_MERGE_BASE_OUTCOME: ${{ steps.download-merge-base.outcome }}

0 commit comments

Comments
 (0)