Skip to content

Commit d06270e

Browse files
authored
[workflows] Fix libclang-abi-tests to work with new version scheme (#91865)
1 parent 83d9aa2 commit d06270e

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

.github/workflows/libclang-abi-tests.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
ABI_HEADERS: ${{ steps.vars.outputs.ABI_HEADERS }}
3434
ABI_LIBS: ${{ steps.vars.outputs.ABI_LIBS }}
3535
BASELINE_VERSION_MAJOR: ${{ steps.vars.outputs.BASELINE_VERSION_MAJOR }}
36-
BASELINE_VERSION_MINOR: ${{ steps.vars.outputs.BASELINE_VERSION_MINOR }}
3736
LLVM_VERSION_MAJOR: ${{ steps.version.outputs.LLVM_VERSION_MAJOR }}
3837
LLVM_VERSION_MINOR: ${{ steps.version.outputs.LLVM_VERSION_MINOR }}
3938
LLVM_VERSION_PATCH: ${{ steps.version.outputs.LLVM_VERSION_PATCH }}
@@ -51,9 +50,9 @@ jobs:
5150
id: vars
5251
run: |
5352
remote_repo='https://github.com/llvm/llvm-project'
54-
if [ ${{ steps.version.outputs.LLVM_VERSION_MINOR }} -ne 0 ] || [ ${{ steps.version.outputs.LLVM_VERSION_PATCH }} -eq 0 ]; then
53+
if [ ${{ steps.version.outputs.LLVM_VERSION_PATCH }} -eq 0 ]; then
5554
major_version=$(( ${{ steps.version.outputs.LLVM_VERSION_MAJOR }} - 1))
56-
baseline_ref="llvmorg-$major_version.0.0"
55+
baseline_ref="llvmorg-$major_version.1.0"
5756
5857
# If there is a minor release, we want to use that as the base line.
5958
minor_ref=$(git ls-remote --refs -t "$remote_repo" llvmorg-"$major_version".[1-9].[0-9] | tail -n1 | grep -o 'llvmorg-.\+' || true)
@@ -75,7 +74,7 @@ jobs:
7574
else
7675
{
7776
echo "BASELINE_VERSION_MAJOR=${{ steps.version.outputs.LLVM_VERSION_MAJOR }}"
78-
echo "BASELINE_REF=llvmorg-${{ steps.version.outputs.LLVM_VERSION_MAJOR }}.0.0"
77+
echo "BASELINE_REF=llvmorg-${{ steps.version.outputs.LLVM_VERSION_MAJOR }}.1.0"
7978
echo "ABI_HEADERS=."
8079
echo "ABI_LIBS=libclang.so libclang-cpp.so"
8180
} >> "$GITHUB_OUTPUT"

0 commit comments

Comments
 (0)