From eb1e7bcbca1446d94ef73aa182ecaa5063f60d48 Mon Sep 17 00:00:00 2001 From: Syrus Akbary Date: Thu, 7 Nov 2024 17:57:20 +0100 Subject: [PATCH 01/16] Fix LLVM detection --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 2304081a8b3..09ac693f124 100644 --- a/Makefile +++ b/Makefile @@ -149,19 +149,19 @@ else ifeq ($(ENABLE_LLVM), 1) LLVM_VERSION := $(shell llvm-config --version) compilers += llvm # … or try to autodetect LLVM from `llvm-config-`. -else ifneq (, $(shell which llvm-config-15 2>/dev/null)) - LLVM_VERSION := $(shell llvm-config-15 --version) +else ifneq (, $(shell which llvm-config-18 2>/dev/null)) + LLVM_VERSION := $(shell llvm-config-18 --version) compilers += llvm - # need force LLVM_SYS_150_PREFIX, or llvm_sys will not build in the case - export LLVM_SYS_150_PREFIX = $(shell llvm-config-15 --prefix) + # need force LLVM_SYS_180_PREFIX, or llvm_sys will not build in the case + export LLVM_SYS_180_PREFIX = $(shell llvm-config-18 --prefix) else ifneq (, $(shell which llvm-config 2>/dev/null)) LLVM_VERSION := $(shell llvm-config --version) - ifneq (, $(findstring 15,$(LLVM_VERSION))) + ifneq (, $(findstring 18,$(LLVM_VERSION))) compilers += llvm - export LLVM_SYS_150_PREFIX = $(shell llvm-config --prefix) + export LLVM_SYS_180_PREFIX = $(shell llvm-config --prefix) else ifneq (, $(findstring 14,$(LLVM_VERSION))) compilers += llvm - export LLVM_SYS_150_PREFIX = $(shell llvm-config --prefix) + export LLVM_SYS_180_PREFIX = $(shell llvm-config --prefix) endif endif From a42fd4a8d1b1b142df251da380ee10effb3ee042 Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:16:21 +0000 Subject: [PATCH 02/16] fix(ci): Add to --- .github/workflows/test.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a103b45e5ac..9229a5ef159 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -552,6 +552,7 @@ jobs: run: | ./scripts/alpine-linux-install-deps.sh echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV + echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - name: Set up dependencies for Mac OS run: | brew install automake @@ -797,6 +798,7 @@ jobs: run: | ./scripts/alpine-linux-install-deps.sh echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV + echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - name: Install MSVC dev-cmd (Windows) uses: ilammy/msvc-dev-cmd@v1 if: ${{ matrix.metadata.build == 'windows-x64' }} @@ -917,6 +919,7 @@ jobs: run: | ./scripts/alpine-linux-install-deps.sh echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV + echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - uses: actions/download-artifact@v4 id: download with: From f6fee0fd8c50ac2e1ba1d23c68ddea2e585f7308 Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:29:48 +0000 Subject: [PATCH 03/16] Fix(ci): Download zlib dependency on musl builds --- scripts/alpine-linux-install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/alpine-linux-install-deps.sh b/scripts/alpine-linux-install-deps.sh index 468612d2039..0766b8b1145 100755 --- a/scripts/alpine-linux-install-deps.sh +++ b/scripts/alpine-linux-install-deps.sh @@ -4,4 +4,4 @@ # This script is used by the CI! apk update -apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static +apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static zlib From bba5795cdd6df2df91968606935c662a2472d88d Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Fri, 8 Nov 2024 08:57:16 +0000 Subject: [PATCH 04/16] fix(ci): Add zlib-static to dependencies for musl builds --- scripts/alpine-linux-install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/alpine-linux-install-deps.sh b/scripts/alpine-linux-install-deps.sh index 0766b8b1145..542d500d0c1 100755 --- a/scripts/alpine-linux-install-deps.sh +++ b/scripts/alpine-linux-install-deps.sh @@ -4,4 +4,4 @@ # This script is used by the CI! apk update -apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static zlib +apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static zlib-static From a98b7aa5d34a0e9461e9b22dec0d4dfc41a2e91f Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:29:09 +0000 Subject: [PATCH 05/16] fix(ci/musl): Don't install both llvm18-dev and llvm18-static --- scripts/alpine-linux-install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/alpine-linux-install-deps.sh b/scripts/alpine-linux-install-deps.sh index 542d500d0c1..1b8815d5434 100755 --- a/scripts/alpine-linux-install-deps.sh +++ b/scripts/alpine-linux-install-deps.sh @@ -4,4 +4,4 @@ # This script is used by the CI! apk update -apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static zlib-static +apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig clang18-static llvm18-static zlib-static From 48a7ad827284602b5e570ad408e44ca4e3308b87 Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Mon, 11 Nov 2024 08:11:49 +0000 Subject: [PATCH 06/16] fix(ci): Revert previous removal of llvm18-dev --- scripts/alpine-linux-install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/alpine-linux-install-deps.sh b/scripts/alpine-linux-install-deps.sh index 1b8815d5434..542d500d0c1 100755 --- a/scripts/alpine-linux-install-deps.sh +++ b/scripts/alpine-linux-install-deps.sh @@ -4,4 +4,4 @@ # This script is used by the CI! apk update -apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig clang18-static llvm18-static zlib-static +apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static zlib-static From db8fd39a5f081684e3263d8b01efe5b1d9c2d650 Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Mon, 11 Nov 2024 08:31:33 +0000 Subject: [PATCH 07/16] fix(ci/musl): Use mold --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9229a5ef159..20145d8a622 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -552,7 +552,7 @@ jobs: run: | ./scripts/alpine-linux-install-deps.sh echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV - echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV + echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib -C linker=clang -C link-arg=-fuse-ld=mold" >> $GITHUB_ENV - name: Set up dependencies for Mac OS run: | brew install automake @@ -798,7 +798,7 @@ jobs: run: | ./scripts/alpine-linux-install-deps.sh echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV - echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV + echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib -C linker=clang -C link-arg=-fuse-ld=mold" >> $GITHUB_ENV - name: Install MSVC dev-cmd (Windows) uses: ilammy/msvc-dev-cmd@v1 if: ${{ matrix.metadata.build == 'windows-x64' }} @@ -919,7 +919,7 @@ jobs: run: | ./scripts/alpine-linux-install-deps.sh echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV - echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV + echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib -C linker=clang -C link-arg=-fuse-ld=mold" >> $GITHUB_ENV - uses: actions/download-artifact@v4 id: download with: From 0887c93e28aad6ffab594af4163e61444a4b1aa4 Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Mon, 11 Nov 2024 08:38:26 +0000 Subject: [PATCH 08/16] fix(ci/musl): Install clang --- scripts/alpine-linux-install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/alpine-linux-install-deps.sh b/scripts/alpine-linux-install-deps.sh index 542d500d0c1..5127ca3b44c 100755 --- a/scripts/alpine-linux-install-deps.sh +++ b/scripts/alpine-linux-install-deps.sh @@ -4,4 +4,4 @@ # This script is used by the CI! apk update -apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static zlib-static +apk add build-base bash musl-dev clang curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static zlib-static From 19a93cf6728b8c1d0f0c4559c9cf9ea8b8be3ab4 Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Mon, 11 Nov 2024 08:44:30 +0000 Subject: [PATCH 09/16] fix(ci/musl): Install mold --- scripts/alpine-linux-install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/alpine-linux-install-deps.sh b/scripts/alpine-linux-install-deps.sh index 5127ca3b44c..9b8fd6e86b9 100755 --- a/scripts/alpine-linux-install-deps.sh +++ b/scripts/alpine-linux-install-deps.sh @@ -4,4 +4,4 @@ # This script is used by the CI! apk update -apk add build-base bash musl-dev clang curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static zlib-static +apk add build-base bash musl-dev mold clang curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static zlib-static From 8b816cbe52fbd105c967f1332eff0ed0dda3427a Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Mon, 11 Nov 2024 08:52:28 +0000 Subject: [PATCH 10/16] fix(ci/musl): Intall zstd-static --- scripts/alpine-linux-install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/alpine-linux-install-deps.sh b/scripts/alpine-linux-install-deps.sh index 9b8fd6e86b9..612a5cbc5a5 100755 --- a/scripts/alpine-linux-install-deps.sh +++ b/scripts/alpine-linux-install-deps.sh @@ -4,4 +4,4 @@ # This script is used by the CI! apk update -apk add build-base bash musl-dev mold clang curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static zlib-static +apk add build-base bash musl-dev mold clang curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static zlib-static zstd-static From af22723e3584fc7b73a232522c64093f91bba582 Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:24:01 +0000 Subject: [PATCH 11/16] fix(ci/musl): Use same packages as in build.yml --- scripts/alpine-linux-install-deps.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/alpine-linux-install-deps.sh b/scripts/alpine-linux-install-deps.sh index 612a5cbc5a5..a83820411fc 100755 --- a/scripts/alpine-linux-install-deps.sh +++ b/scripts/alpine-linux-install-deps.sh @@ -4,4 +4,5 @@ # This script is used by the CI! apk update -apk add build-base bash musl-dev mold clang curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static zlib-static zstd-static +apk add bash mold make curl cmake ninja clang18 zstd-static llvm18-dev clang18-static llvm18-static ncurses-static zlib-static +ln -s /usr/bin/clang-18 /usr/bin/clang \ No newline at end of file From 151336ba9ccf45453e3d422a0a2506231b646c48 Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Mon, 11 Nov 2024 12:09:43 +0000 Subject: [PATCH 12/16] fix(ci/musl): Don't use mold --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 20145d8a622..9229a5ef159 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -552,7 +552,7 @@ jobs: run: | ./scripts/alpine-linux-install-deps.sh echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV - echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib -C linker=clang -C link-arg=-fuse-ld=mold" >> $GITHUB_ENV + echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - name: Set up dependencies for Mac OS run: | brew install automake @@ -798,7 +798,7 @@ jobs: run: | ./scripts/alpine-linux-install-deps.sh echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV - echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib -C linker=clang -C link-arg=-fuse-ld=mold" >> $GITHUB_ENV + echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - name: Install MSVC dev-cmd (Windows) uses: ilammy/msvc-dev-cmd@v1 if: ${{ matrix.metadata.build == 'windows-x64' }} @@ -919,7 +919,7 @@ jobs: run: | ./scripts/alpine-linux-install-deps.sh echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV - echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib -C linker=clang -C link-arg=-fuse-ld=mold" >> $GITHUB_ENV + echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - uses: actions/download-artifact@v4 id: download with: From e6844c8025108bd02ff7609d4c7fe51290280104 Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Mon, 11 Nov 2024 12:38:14 +0000 Subject: [PATCH 13/16] fix(ci/musl): Disable LLVM on musl --- .github/workflows/test.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9229a5ef159..5a52d141e12 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -551,8 +551,9 @@ jobs: if: matrix.metadata.build == 'linux-musl' run: | ./scripts/alpine-linux-install-deps.sh - echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV - echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV + # echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV + # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV + echo "ENABLE_LLVM=0" >> $GITHUB_ENV - name: Set up dependencies for Mac OS run: | brew install automake @@ -797,8 +798,9 @@ jobs: if: matrix.metadata.build == 'linux-musl' run: | ./scripts/alpine-linux-install-deps.sh - echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV - echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV + # echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV + # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV + echo "ENABLE_LLVM=0" >> $GITHUB_ENV - name: Install MSVC dev-cmd (Windows) uses: ilammy/msvc-dev-cmd@v1 if: ${{ matrix.metadata.build == 'windows-x64' }} @@ -918,8 +920,9 @@ jobs: if: matrix.build == 'linux-musl' run: | ./scripts/alpine-linux-install-deps.sh - echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV - echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV + # echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV + # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV + echo "ENABLE_LLVM=0" >> $GITHUB_ENV - uses: actions/download-artifact@v4 id: download with: From 05db35fa092c82caa9d5286d9af365e61fc5f170 Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Mon, 11 Nov 2024 12:49:08 +0000 Subject: [PATCH 14/16] fix(ci/musl): Fix typo --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5a52d141e12..612be41d243 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -553,7 +553,7 @@ jobs: ./scripts/alpine-linux-install-deps.sh # echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - echo "ENABLE_LLVM=0" >> $GITHUB_ENV + echo "ENABLE_LLVM=0" >> $GITHUB_ENV - name: Set up dependencies for Mac OS run: | brew install automake @@ -922,7 +922,7 @@ jobs: ./scripts/alpine-linux-install-deps.sh # echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - echo "ENABLE_LLVM=0" >> $GITHUB_ENV + echo "ENABLE_LLVM=0" >> $GITHUB_ENV - uses: actions/download-artifact@v4 id: download with: From f65e257160520d95cf0d25cefe7492388cc6c1ee Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Mon, 11 Nov 2024 13:02:55 +0000 Subject: [PATCH 15/16] fix(ci/musl): Fix another typo --- .github/workflows/test.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 612be41d243..9d0f5de5297 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -550,10 +550,10 @@ jobs: - name: Set up base deps on musl if: matrix.metadata.build == 'linux-musl' run: | - ./scripts/alpine-linux-install-deps.sh + ./scripts/alpine-linux-install-deps.sh + echo "ENABLE_LLVM=0" >> $GITHUB_ENV # echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - echo "ENABLE_LLVM=0" >> $GITHUB_ENV - name: Set up dependencies for Mac OS run: | brew install automake @@ -798,9 +798,9 @@ jobs: if: matrix.metadata.build == 'linux-musl' run: | ./scripts/alpine-linux-install-deps.sh + echo "ENABLE_LLVM=0" >> $GITHUB_ENV # echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - echo "ENABLE_LLVM=0" >> $GITHUB_ENV - name: Install MSVC dev-cmd (Windows) uses: ilammy/msvc-dev-cmd@v1 if: ${{ matrix.metadata.build == 'windows-x64' }} @@ -920,9 +920,9 @@ jobs: if: matrix.build == 'linux-musl' run: | ./scripts/alpine-linux-install-deps.sh + echo "ENABLE_LLVM=0" >> $GITHUB_ENV # echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - echo "ENABLE_LLVM=0" >> $GITHUB_ENV - uses: actions/download-artifact@v4 id: download with: From e4c740d20f4e41b6c0fe1de54b7e00f4b74efdc0 Mon Sep 17 00:00:00 2001 From: edoardo <48774736+xdoardo@users.noreply.github.com> Date: Mon, 11 Nov 2024 13:24:57 +0000 Subject: [PATCH 16/16] fix(ci/musl): Uncomment setting for llvm-config --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9d0f5de5297..1c41776f6b4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -552,7 +552,7 @@ jobs: run: | ./scripts/alpine-linux-install-deps.sh echo "ENABLE_LLVM=0" >> $GITHUB_ENV - # echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV + echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - name: Set up dependencies for Mac OS run: | @@ -799,7 +799,7 @@ jobs: run: | ./scripts/alpine-linux-install-deps.sh echo "ENABLE_LLVM=0" >> $GITHUB_ENV - # echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV + echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - name: Install MSVC dev-cmd (Windows) uses: ilammy/msvc-dev-cmd@v1 @@ -921,7 +921,7 @@ jobs: run: | ./scripts/alpine-linux-install-deps.sh echo "ENABLE_LLVM=0" >> $GITHUB_ENV - # echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV + echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - uses: actions/download-artifact@v4 id: download