Skip to content

Commit d8bce4b

Browse files
authored
Fix llvm build workflow (#3)
1 parent e7f2fe6 commit d8bce4b

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

.github/workflows/llvm.yml

+10-11
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
@@ -36,21 +36,21 @@ jobs:
3636
BIN_SUFFIX: ''
3737
SO_SUFFIX: '${{ inputs.version }}.dylib'
3838
STATIC_LIB_SUFFIX: 'a'
39-
LLVM_TARGETS_TO_BUILD: 'ARM'
39+
LLVM_TARGETS_TO_BUILD: 'AArch64'
4040
- os: linux-amd64
41-
runner: ubuntu-latest
41+
runner: ubuntu-22.04
4242
toolchain: default
4343
BIN_SUFFIX: ''
4444
SO_SUFFIX: 'so.${{ inputs.version }}'
4545
STATIC_LIB_SUFFIX: 'a'
4646
LLVM_TARGETS_TO_BUILD: 'X86'
4747
- os: linux-arm64
48-
runner: ubuntu-latest
48+
runner: ubuntu-22.04
4949
toolchain: zig-linux-arm64
5050
BIN_SUFFIX: ''
5151
SO_SUFFIX: 'so.${{ inputs.version }}'
5252
STATIC_LIB_SUFFIX: 'a'
53-
LLVM_TARGETS_TO_BUILD: 'ARM'
53+
LLVM_TARGETS_TO_BUILD: 'AArch64'
5454
- os: windows-amd64
5555
runner: windows-latest
5656
toolchain: default
@@ -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,15 +95,12 @@ 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: |
103102
cd llvm/build
104-
ninja $LLVM_TARGETS
103+
ninja $LLVM_TARGETS # Ninja automatically builds in parallel
105104
- name: Upload products
106105
shell: bash
107106
run: |

build/llvm/common.args

+12-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,15 @@
33
-DBUILD_SHARED_LIBS=OFF
44
-DLLDB_ENABLE_PYTHON=0
55
-DLLDB_INCLUDE_TESTS=0
6-
6+
-DLLVM_INCLUDE_BENCHMARKS=OFF
7+
-DLLVM_INCLUDE_EXAMPLES=OFF
8+
-DLLVM_INCLUDE_RUNTIMES=OFF
9+
-DLLVM_INCLUDE_TESTS=OFF
10+
-DLLVM_INCLUDE_UTILS=OFF
11+
-DLLVM_ENABLE_IDE=ON
12+
-DLLVM_ENABLE_PLUGINS=OFF
13+
-DCLANG_ENABLE_ARCMT=OFF
14+
-DCLANG_ENABLE_STATIC_ANALYZER=OFF
15+
-DCLANG_PLUGIN_SUPPORT=OFF
16+
-DCMAKE_CXX_FLAGS=-g0
17+
-DCMAKE_C_FLAGS=-g0

0 commit comments

Comments
 (0)