Skip to content

Commit 6d10779

Browse files
k0kubunnobu
andauthored
Use matrix.entry for the Ubuntu workflow (#7205)
This seems easier to understand. Co-authored-by: Nobuyoshi Nakada <nobu@ruby-lang.org>
1 parent 5b67c15 commit 6d10779

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

.github/workflows/ubuntu.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,12 @@ jobs:
2626
make:
2727
strategy:
2828
matrix:
29-
# main variables included in the job name
30-
test_task: [check]
31-
configure: [cppflags=-DRUBY_DEBUG] # default to use more assertions
32-
arch: ['']
33-
# specify all jobs with `include` to avoid testing duplicated things
34-
include:
29+
entry:
3530
- test_task: check
3631
- test_task: check
3732
arch: i686
38-
configure: '' # test without -DRUBY_DEBUG as well
3933
- test_task: check
40-
configure: "--enable-shared --enable-load-relative"
34+
configure: '--enable-shared --enable-load-relative'
4135
- test_task: test-all TESTS=--repeat-count=2
4236
- test_task: test-bundler-parallel
4337
- test_task: test-bundled-gems
@@ -89,8 +83,9 @@ jobs:
8983
- name: Run configure
9084
env:
9185
arch: ${{matrix.arch}}
86+
configure: ${{matrix.configure}}
9287
run: >-
93-
$SETARCH ../src/configure -C --disable-install-doc ${{ matrix.configure }}
88+
$SETARCH ../src/configure -C --disable-install-doc ${configure:-cppflags=-DRUBY_DEBUG}
9489
${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE}
9590
- run: $SETARCH make incs
9691
- run: $SETARCH make prepare-gems

0 commit comments

Comments
 (0)