Skip to content

Commit 47d094a

Browse files
committed
Switch to julia-release/19.x
1 parent 77959b6 commit 47d094a

18 files changed

+5
-1524
lines changed

.github/workflows/build-and-test-template.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,15 @@ jobs:
110110
111111
include("../common.jl")
112112
113-
src_name, src_version, sources, script, platforms, products, dependencies = configure_build([], version; update_sdk=false, assert=true, experimental_platforms=true, git_path=git_path=git_path="https://github.com/llvm/llvm-project.git", git_ver=ENV["LLVM_VERSION"])
113+
src_name, src_version, sources, script, platforms, products, dependencies = configure_build([], version; update_sdk=false, assert=true, experimental_platforms=true, git_path=git_path=git_path="https://github.com/JuliaLang/llvm-project.git", git_ver=ENV["LLVM_VERSION"])
114114
products = Product[]
115115
build_tarballs(["--verbose", "${{ inputs.target }}", "--skip-audit"], src_name, src_version, sources, script, platforms, products, dependencies; preferred_gcc_version=v"10", preferred_llvm_version=v"16", julia_compat="1.6")
116116
'
117117
- name: Work out which julia patches to apply
118118
id: julia_patches
119119
run: |
120120
set -o xtrace
121-
cd binarybuilder_storage/downloads/clones/llvm-project.git-1df819a03ecf6890e3787b27bfd4f160aeeeeacd50a98d003be8b0893f11a9be # https://github.com/JuliaPackaging/BinaryBuilderBase.jl/blob/b77c32e367f6db32517967d2b3c41f2c9850806b/src/Sources.jl#L209
121+
cd binarybuilder_storage/downloads/clones/llvm-project.git-5a9787eb535c2edc5dea030cc221c1d60f38c9f42344f410e425ea2139e233aa # https://github.com/JuliaPackaging/BinaryBuilderBase.jl/blob/b77c32e367f6db32517967d2b3c41f2c9850806b/src/Sources.jl#L209
122122
123123
JULIA_PATCHES_TO_APPLY=()
124124
for patch in $GITHUB_WORKSPACE/julia-patches/*; do
@@ -240,7 +240,7 @@ jobs:
240240
done
241241
242242
mkdir -p deps/srccache
243-
JULIA_LLVM_VERSION=$(grep 'version' stdlib/libLLVM_jll/Project.toml | sed 's/version = "\(.*\)"/\1/')
243+
JULIA_LLVM_VERSION=$(grep 'version' stdlib/libLLVM_jll/Project.toml | sed 's/version = "\(.*\)"/\1/')
244244
mv ../LLVM_full_assert.v${LLVM_VERSION_MAJOR}.0.0.${{ inputs.target }}.tar.gz deps/srccache/libLLVM.v$JULIA_LLVM_VERSION.${{ inputs.target }}.tar.gz
245245
246246
make -j4 FORCE_ASSERTIONS=1 LLVM_ASSERTIONS=1 VERBOSE=1 LLVM_JLL_TAGS= LLVM_SHARED_LIB_VER_SUFFIX=${LLVM_VERSION_MAJOR}jl JULIA_CPU_TARGET="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)"

.github/workflows/build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
run: |
3535
set -o xtrace
3636
if [ -z "$LLVM_VERSION" ]; then
37-
LLVM_VERSION=$(git ls-remote https://github.com/llvm/llvm-project.git | grep 'refs/heads/main$' | awk '{print $1}')
37+
LLVM_VERSION=$(git ls-remote https://github.com/JuliaLang/llvm-project.git | grep 'refs/heads/julia-release/19.x$' | awk '{print $1}')
3838
fi
39-
LLVM_VERSION_MAJOR=$(curl -s https://raw.githubusercontent.com/llvm/llvm-project/$LLVM_VERSION/cmake/Modules/LLVMVersion.cmake | grep -oP 'set\(LLVM_VERSION_MAJOR \K[0-9]+')
39+
LLVM_VERSION_MAJOR=$(curl -s https://raw.githubusercontent.com/JuliaLang/llvm-project/$LLVM_VERSION/cmake/Modules/LLVMVersion.cmake | grep -oP 'set\(LLVM_VERSION_MAJOR \K[0-9]+')
4040
echo "LLVM_VERSION=$LLVM_VERSION" >> "$GITHUB_OUTPUT"
4141
echo "LLVM_VERSION_MAJOR=$LLVM_VERSION_MAJOR" >> "$GITHUB_OUTPUT"
4242
build:

julia-patches/1b7b3b8d354a28f5fb1381c61c5663819d29a974

Lines changed: 0 additions & 25 deletions
This file was deleted.

julia-patches/29441e4f5fa5f5c7709f7cf180815ba97f611297

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)