Skip to content

Commit 6bba6dd

Browse files
committed
ZJIT: Use clang-16 for bindgen on CI
Since many of us developing ZJIT are on at least Clang 16 locally now due to recent macOS update, let's use Clang 16 on CI, too. There is some differences between https://github.com/llvm/llvm-project Clang and Apple Clang, even when the version number match, but I figure it's good to shrink the difference anyways.
1 parent fa409d5 commit 6bba6dd

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

.github/workflows/zjit-ubuntu.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,9 @@ jobs:
6969

7070
- test_task: 'zjit-bindgen'
7171
hint: 'To fix: use patch in logs'
72-
configure: '--enable-zjit=dev --with-gcc=clang-14'
73-
libclang_path: '/usr/lib/llvm-14/lib/libclang.so.1'
74-
75-
- test_task: 'test-bundled-gems'
76-
configure: '--enable-zjit=dev'
77-
run_opts: '--zjit-call-threshold=1'
72+
configure: '--enable-zjit=dev --with-gcc=clang-16'
73+
clang_path: '/usr/bin/clang-16'
74+
runs-on: 'ubuntu-24.04' # for clang-16
7875

7976
env:
8077
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
@@ -87,7 +84,7 @@ jobs:
8784
RUST_BACKTRACE: 1
8885
ZJIT_RB_BUG: 1
8986

90-
runs-on: ubuntu-22.04
87+
runs-on: ${{ matrix.runs-on || 'ubuntu-22.04' }}
9188

9289
if: >-
9390
${{!(false
@@ -175,7 +172,7 @@ jobs:
175172
PRECHECK_BUNDLED_GEMS: 'no'
176173
SYNTAX_SUGGEST_TIMEOUT: '5'
177174
ZJIT_BINDGEN_DIFF_OPTS: '--exit-code'
178-
LIBCLANG_PATH: ${{ matrix.libclang_path }}
175+
CLANG_PATH: ${{ matrix.clang_path }}
179176
TESTS: ${{ matrix.test_all_opts }}
180177
continue-on-error: ${{ matrix.continue-on-test_task || false }}
181178

0 commit comments

Comments
 (0)