Skip to content

Commit 6d2b982

Browse files
committed
move ubuntu build test, run zjit-test under combo build
test-all still runs only with --enable-zjit=dev so we get exposure to both build configs.
1 parent 674f8e6 commit 6d2b982

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

.github/workflows/compilers.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ jobs:
299299
- { uses: './.github/actions/compilers', name: 'VM_DEBUG_BP_CHECK', with: { cppflags: '-DVM_DEBUG_BP_CHECK' } }
300300
- { uses: './.github/actions/compilers', name: 'VM_DEBUG_VERIFY_METHOD_CACHE', with: { cppflags: '-DVM_DEBUG_VERIFY_METHOD_CACHE' } }
301301
- { uses: './.github/actions/compilers', name: 'enable-yjit', with: { append_configure: '--enable-yjit' } }
302+
- { uses: './.github/actions/compilers', name: 'enable-{y,z}jit', with: { append_configure: '--enable-yjit --enable-zjit' } }
302303
- { uses: './.github/actions/compilers', name: 'YJIT_FORCE_ENABLE', with: { cppflags: '-DYJIT_FORCE_ENABLE' } }
303304
- { uses: './.github/actions/compilers', name: 'UNIVERSAL_PARSER', with: { cppflags: '-DUNIVERSAL_PARSER' } }
304305

.github/workflows/zjit-ubuntu.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,8 @@ jobs:
3737
configure: '--enable-zjit=dev --with-gcc=clang-14'
3838
libclang_path: '/usr/lib/llvm-14/lib/libclang.so.1'
3939

40-
- test_task: 'ruby' # build test for combo build
41-
configure: '--enable-yjit --enable-zjit'
42-
43-
- test_task: 'ruby' # build test for combo build
44-
configure: '--enable-yjit=dev --enable-zjit'
45-
4640
- test_task: 'zjit-test'
47-
configure: '--enable-zjit=dev'
41+
configure: '--enable-yjit=dev --enable-zjit'
4842

4943
- test_task: 'test-all'
5044
configure: '--enable-zjit=dev'

0 commit comments

Comments
 (0)