diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-06-30 17:04:17 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-06-30 17:56:04 +0900 |
| commit | 7dfaa617a44d28e8b04eafb7d1af2a8da26f5b26 (patch) | |
| tree | db9106035261f29f9c342116f4d4e75a2b518fa3 /.github/workflows/ubuntu.yml | |
| parent | f4d70e1cd80d6c70753a34f69c650f2ba70d67f8 (diff) | |
Use `matrix.arch` separated from `matrix.configure`
Statically determined value should be set statically.
Diffstat (limited to '.github/workflows/ubuntu.yml')
| -rw-r--r-- | .github/workflows/ubuntu.yml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 4aa87258f9..21bc285d7d 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -26,7 +26,8 @@ jobs: configure: ["", "cppflags=-DRUBY_DEBUG"] include: - test_task: "check" - configure: "--host=i686-$OSTYPE" + configure: "" + arch: i686 - test_task: "check" configure: "--enable-shared --enable-load-relative" skipped_tests: "TestGem#test_.*_from_binstubs.*" @@ -36,6 +37,7 @@ jobs: env: GITPULLOPTIONS: --no-tags origin ${{github.ref}} RUBY_DEBUG: ci + SETARCH: ${{ matrix.arch && format('setarch {0}', matrix.arch) }} runs-on: ${{ matrix.os || 'ubuntu-20.04' }} if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} steps: @@ -46,12 +48,11 @@ jobs: configure: ${{matrix.configure}} run: | echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV - arch=`echo " $configure" | sed '/.* --host=/!d;s///;s/[- ].*//'` - echo "SETARCH=${arch:+setarch $arch}" >> $GITHUB_ENV - name: Install libraries + env: + arch: ${{matrix.arch}} run: | set -x - arch="${SETARCH##* }" arch=${arch:+:${arch/i[3-6]86/i386}} ${arch:+sudo dpkg --add-architecture ${arch#:}} sudo apt-get update -q || : @@ -84,7 +85,7 @@ jobs: arch: ${{matrix.arch}} run: >- $SETARCH ../src/configure -C --disable-install-doc ${{ matrix.configure }} - ${arch:+--target=$arch-$OSTYPE} + ${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE} - run: $SETARCH make incs - run: $SETARCH make - run: $SETARCH make leaked-globals |