workflows: Fix baseline version for llvm abi checks#85166
Merged
Conversation
The baseline version calculations was assuming the minor release would always be 0.
Member
|
@llvm/pr-subscribers-github-workflow Author: Tom Stellard (tstellar) ChangesThe baseline version calculations was assuming the minor release would always be 0. Full diff: https://github.com/llvm/llvm-project/pull/85166.diff 1 Files Affected:
diff --git a/.github/workflows/llvm-tests.yml b/.github/workflows/llvm-tests.yml
index 127628d76f1913..4c6d01a4b801cd 100644
--- a/.github/workflows/llvm-tests.yml
+++ b/.github/workflows/llvm-tests.yml
@@ -42,6 +42,7 @@ jobs:
BASELINE_REF: ${{ steps.vars.outputs.BASELINE_REF }}
ABI_HEADERS: ${{ steps.vars.outputs.ABI_HEADERS }}
BASELINE_VERSION_MAJOR: ${{ steps.vars.outputs.BASELINE_VERSION_MAJOR }}
+ BASELINE_VERSION_MINOR: ${{ steps.vars.outputs.BASELINE_VERSION_MINOR }}
LLVM_VERSION_MAJOR: ${{ steps.version.outputs.LLVM_VERSION_MAJOR }}
LLVM_VERSION_MINOR: ${{ steps.version.outputs.LLVM_VERSION_MINOR }}
LLVM_VERSION_PATCH: ${{ steps.version.outputs.LLVM_VERSION_PATCH }}
@@ -58,15 +59,27 @@ jobs:
- name: Setup Variables
id: vars
run: |
- if [ ${{ steps.version.outputs.LLVM_VERSION_MINOR }} -ne 0 ] || [ ${{ steps.version.outputs.LLVM_VERSION_PATCH }} -eq 0 ]; then
+ # libLLVM:
+ # 18.1.0 we aren't doing ABI checks.
+ # 18.1.1 We want to check 18.1.0.
+ # libclang:
+ # 18.1.0 We want to check 17.0.x
+ # 18.1.1 We want to check 18.1.0
+ if [ ${{ steps.version.outputs.LLVM_VERSION_PATCH }} -eq 0 ]; then
{
echo "BASELINE_VERSION_MAJOR=$(( ${{ steps.version.outputs.LLVM_VERSION_MAJOR }} - 1))"
echo "ABI_HEADERS=llvm-c"
+ if [ "${{ steps.version.outputs.LLVM_VERSION_MAJOR }}" -le 18 ]; then
+ echo "BASELINE_VERSION_MINOR=0"
+ else
+ echo "BASELINE_VERSION_MINOR=1"
+ fi
} >> "$GITHUB_OUTPUT"
else
{
echo "BASELINE_VERSION_MAJOR=${{ steps.version.outputs.LLVM_VERSION_MAJOR }}"
echo "ABI_HEADERS=."
+ echo "BASELINE_VERSION_MINOR=1"
} >> "$GITHUB_OUTPUT"
fi
@@ -82,7 +95,7 @@ jobs:
include:
- name: build-baseline
llvm_version_major: ${{ needs.abi-dump-setup.outputs.BASELINE_VERSION_MAJOR }}
- ref: llvmorg-${{ needs.abi-dump-setup.outputs.BASELINE_VERSION_MAJOR }}.0.0
+ ref: llvmorg-${{ needs.abi-dump-setup.outputs.BASELINE_VERSION_MAJOR }}.${{ needs.abi-dump-setup.outputs.BASELINE_VERSION_MINOR }}.0
repo: llvm/llvm-project
- name: build-latest
llvm_version_major: ${{ needs.abi-dump-setup.outputs.LLVM_VERSION_MAJOR }}
|
nikic
reviewed
Mar 14, 2024
| { | ||
| echo "BASELINE_VERSION_MAJOR=$(( ${{ steps.version.outputs.LLVM_VERSION_MAJOR }} - 1))" | ||
| echo "ABI_HEADERS=llvm-c" | ||
| if [ "${{ steps.version.outputs.LLVM_VERSION_MAJOR }}" -le 18 ]; then |
Contributor
There was a problem hiding this comment.
Do we need this, given that we're not going to make changes to older versions anymore?
nikic
reviewed
Mar 15, 2024
| { | ||
| echo "BASELINE_VERSION_MAJOR=$(( ${{ steps.version.outputs.LLVM_VERSION_MAJOR }} - 1))" | ||
| echo "ABI_HEADERS=llvm-c" | ||
| echo "ABI_HEADERS=llvm-c" |
| # libLLVM: | ||
| # 18.1.0 we aren't doing ABI checks. | ||
| # 18.1.1 We want to check 18.1.0. | ||
| # libclang: |
Contributor
There was a problem hiding this comment.
Isn't libclang handled by the separate libclang-abi-tests workflow?
I think you probably meant the LLVM C API rather than libclang here?
Contributor
Author
|
/cherry-pick d93363a |
llvmbot
pushed a commit
to llvmbot/llvm-project
that referenced
this pull request
Mar 19, 2024
The baseline version calculations was assuming the minor release would always be 0. (cherry picked from commit d93363a)
Member
|
/pull-request #85789 |
chencha3
pushed a commit
to chencha3/llvm-project
that referenced
this pull request
Mar 23, 2024
The baseline version calculations was assuming the minor release would always be 0.
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The baseline version calculations was assuming the minor release would always be 0.