Skip to content

Commit 0fd6705

Browse files
committed
Fix llvm build workflow
1 parent e7f2fe6 commit 0fd6705

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/llvm.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
LLVM_TARGETS: 'clang-format'
1616
LLVM_BINS: 'clang-format'
1717
LLVM_LIBS: ''
18-
ZIG_VERSION: '0.14.0-dev.1651+ffd071f55'
18+
ZIG_VERSION: '0.14.0-dev.2487+af89bb05d'
1919
jobs:
2020
create-release:
2121
runs-on: ubuntu-latest
@@ -77,8 +77,10 @@ jobs:
7777
choco install cmake ninja curl
7878
- name: Get zig toolchain
7979
if: startsWith(matrix.platform.toolchain, 'zig')
80+
shell: bash
8081
run: |
81-
curl -L https://ziglang.org/builds/zig-linux-x86_64-$ZIG_VERSION.tar.xz -o zig.tar.xz
82+
echo "zig is $ZIG_VERSION"
83+
curl -L https://ziglang.org/builds/zig-linux-x86_64-${ZIG_VERSION}.tar.xz -o zig.tar.xz
8284
mkdir zig
8385
tar -C zig --strip-components=1 -xJf zig.tar.xz
8486
cd zig
@@ -93,10 +95,7 @@ jobs:
9395
shell: bash
9496
run: |
9597
cd llvm
96-
cmake -B build llvm -GNinja \
97-
-DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/build/llvm/${{ matrix.platform.toolchain }}.cmake \
98-
$(cat $GITHUB_WORKSPACE/build/llvm/common.args) \
99-
-DLLVM_TARGETS_TO_BUILD=${{ matrix.platform.LLVM_TARGETS_TO_BUILD }}
98+
cmake -B build llvm -GNinja -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/build/llvm/${{ matrix.platform.toolchain }}.cmake $(cat $GITHUB_WORKSPACE/build/llvm/common.args) -DLLVM_TARGETS_TO_BUILD=${{ matrix.platform.LLVM_TARGETS_TO_BUILD }}
10099
- name: Build targets
101100
shell: bash
102101
run: |

build/llvm/common.args

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
-DBUILD_SHARED_LIBS=OFF
44
-DLLDB_ENABLE_PYTHON=0
55
-DLLDB_INCLUDE_TESTS=0
6-

0 commit comments

Comments
 (0)