[llvm-branch-commits] [llvm] Windows fix 23 (PR #215033)
Tom Stellard via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Sat Aug 8 18:25:27 PDT 2026
https://github.com/tstellar updated https://github.com/llvm/llvm-project/pull/215033
>From 84483f1b724b933c88d6524216e41398cb55bd87 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Sat, 8 Aug 2026 15:28:41 -0700
Subject: [PATCH 1/6] Debug
---
.github/workflows/release-binaries.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 3c1b775419d06..9583807f646cf 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -108,6 +108,7 @@ jobs:
else
if [ "$RUNNER_OS" = "Windows" ]; then
release_version="$LLVM_VERSION_FROM_SOURCE"
+ release_version-"23.0.0.2"
else
release_version="${{ (github.event_name == 'pull_request' && format('PR{0}', github.event.pull_request.number)) || 'CI'}}-$GITHUB_SHA"
fi
>From 429d964b6bf563706211b6614091a88a0302962a Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Sat, 8 Aug 2026 15:38:00 -0700
Subject: [PATCH 2/6] Fix typo
---
.github/workflows/release-binaries.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 9583807f646cf..c7ba75a95e635 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -108,7 +108,7 @@ jobs:
else
if [ "$RUNNER_OS" = "Windows" ]; then
release_version="$LLVM_VERSION_FROM_SOURCE"
- release_version-"23.0.0.2"
+ release_version="23.0.0.2"
else
release_version="${{ (github.event_name == 'pull_request' && format('PR{0}', github.event.pull_request.number)) || 'CI'}}-$GITHUB_SHA"
fi
>From 07dc83a136a57f320e4f3bac3b51ca3d7dfd8354 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Sat, 8 Aug 2026 15:38:17 -0700
Subject: [PATCH 3/6] Debug
---
.github/workflows/release-binaries-all.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.github/workflows/release-binaries-all.yml b/.github/workflows/release-binaries-all.yml
index 862300a8118e5..48454ee4f0d63 100644
--- a/.github/workflows/release-binaries-all.yml
+++ b/.github/workflows/release-binaries-all.yml
@@ -108,11 +108,7 @@ jobs:
# We use ubuntu-22.04 rather than the latest version to make the built
# binaries more portable (eg functional aginast older glibc).
runs-on:
- - ubuntu-22.04
- - ubuntu-22.04-arm
- - macos-14
- windows-2022
- - windows-11-arm
uses: ./.github/workflows/release-binaries.yml
with:
>From b3f1d075be978ba06da57da642f46f16203fcb62 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Sat, 8 Aug 2026 17:51:28 -0700
Subject: [PATCH 4/6] Programaatically change the version
---
.github/workflows/release-binaries.yml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index c7ba75a95e635..617eccea14c2a 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -90,6 +90,7 @@ jobs:
id: vars
env:
LLVM_VERSION_FROM_SOURCE: ${{ steps.version-from-source.outputs.full-no-suffix }}
+ LLVM_VERSION_MAJOR: ${{ steps.version-from-source.outputs.major }}
INPUTS_RUNS_ON: ${{ inputs.runs-on }}
shell: bash
# In order for the test-release.sh script to run correctly, the LLVM
@@ -108,12 +109,18 @@ jobs:
else
if [ "$RUNNER_OS" = "Windows" ]; then
release_version="$LLVM_VERSION_FROM_SOURCE"
- release_version="23.0.0.2"
else
release_version="${{ (github.event_name == 'pull_request' && format('PR{0}', github.event.pull_request.number)) || 'CI'}}-$GITHUB_SHA"
fi
ref="$GITHUB_SHA"
fi
+
+ if [ "$RUNNER_OS" = "Windows" ] && grep 'rc' <<< $release_version; then
+ # The Wix installer generator does not support strings in the version number,
+ # so we need to fixup the version number for release candidates.
+ release_version="$LLVM_VERSION_MAJOR.0.0.$(cut -d c -f2 <<< $release_version)"
+ fi
+
if [ -n "${{ inputs.upload }}" ]; then
upload="${{ inputs.upload }}"
else
>From 7db7502d31544a3759593896e263cafe6827fa72 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Sat, 8 Aug 2026 18:21:44 -0700
Subject: [PATCH 5/6] Debug
---
.github/workflows/release-binaries.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 617eccea14c2a..9908007929535 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -120,6 +120,7 @@ jobs:
# so we need to fixup the version number for release candidates.
release_version="$LLVM_VERSION_MAJOR.0.0.$(cut -d c -f2 <<< $release_version)"
fi
+ echo RELEASE VERSION: $release_version
if [ -n "${{ inputs.upload }}" ]; then
upload="${{ inputs.upload }}"
>From 2c67eb20b43a845e7d64988c0c9b0836e7b689d2 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar at redhat.com>
Date: Sat, 8 Aug 2026 18:25:06 -0700
Subject: [PATCH 6/6] Debug
---
.github/workflows/release-binaries.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
index 9908007929535..7a681960bd846 100644
--- a/.github/workflows/release-binaries.yml
+++ b/.github/workflows/release-binaries.yml
@@ -115,6 +115,8 @@ jobs:
ref="$GITHUB_SHA"
fi
+ echo RELEASE VERSION: $release_version
+ grep 'rc' <<< $release_version
if [ "$RUNNER_OS" = "Windows" ] && grep 'rc' <<< $release_version; then
# The Wix installer generator does not support strings in the version number,
# so we need to fixup the version number for release candidates.
More information about the llvm-branch-commits
mailing list