|
30 | 30 | os:
|
31 | 31 | - ubuntu-24.04
|
32 | 32 | - ubuntu-24.04-arm
|
33 |
| - # FIXME Comment out ppc64le due to failing tests on GitHub Actions |
34 |
| - # ppc64le |
35 |
| - # https://bugs.ruby-lang.org/issues/21534 |
36 |
| - # - ubuntu-24.04-ppc64le |
| 33 | + - ubuntu-24.04-ppc64le |
37 | 34 | - ubuntu-24.04-s390x
|
38 | 35 | # The ppc64le/s390x runners work only in the registered repositories.
|
39 | 36 | # They don't work in forked repositories.
|
@@ -121,9 +118,15 @@ jobs:
|
121 | 118 | env:
|
122 | 119 | arch: ${{ matrix.arch }}
|
123 | 120 | configure: ${{ matrix.configure }}
|
124 |
| - run: >- |
125 |
| - $SETARCH ../src/configure -C --disable-install-doc ${configure:-cppflags=-DRUBY_DEBUG} |
126 |
| - ${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE} |
| 121 | + # Don't set cppflags=-DRUBY_DEBUG on ppc64le, due to some Ractor tests |
| 122 | + # failing in the case. |
| 123 | + # https://bugs.ruby-lang.org/issues/21534 |
| 124 | + run: | |
| 125 | + if [ "$(uname -m)" != "ppc64le" ]; then |
| 126 | + configure="${configure:-cppflags=-DRUBY_DEBUG}" |
| 127 | + fi |
| 128 | + $SETARCH ../src/configure -C --disable-install-doc ${configure} \ |
| 129 | + ${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE} |
127 | 130 |
|
128 | 131 | - run: $SETARCH make prepare-gems
|
129 | 132 | if: ${{ matrix.test_task == 'test-bundled-gems' }}
|
@@ -166,12 +169,19 @@ jobs:
|
166 | 169 | diff -u ../src/spec/ruby/library/etc/struct_passwd_spec.rb{.orig,} || :
|
167 | 170 | if: ${{ endsWith(matrix.os, 'ppc64le') || endsWith(matrix.os, 's390x') }}
|
168 | 171 |
|
| 172 | + # A temporary workaround: Limit CPU number for make check to avoid |
| 173 | + # failing tests due to timeout. |
| 174 | + # https://github.com/IBM/actionspz/issues/38 |
| 175 | + - name: Limit CPU number |
| 176 | + run: echo "JOBS=-j$(nproc)" >> "$GITHUB_ENV" |
| 177 | + if: ${{ endsWith(matrix.os, 'ppc64le') || endsWith(matrix.os, 's390x') }} |
| 178 | + |
169 | 179 | - name: make ${{ matrix.test_task }}
|
170 | 180 | run: |
|
171 | 181 | test -n "${LAUNCHABLE_STDOUT}" && exec 1> >(tee "${LAUNCHABLE_STDOUT}")
|
172 | 182 | test -n "${LAUNCHABLE_STDERR}" && exec 2> >(tee "${LAUNCHABLE_STDERR}")
|
173 | 183 |
|
174 |
| - $SETARCH make -s ${{ matrix.test_task }} \ |
| 184 | + $SETARCH make -s $JOBS ${{ matrix.test_task }} \ |
175 | 185 | ${TESTS:+TESTS="$TESTS"} \
|
176 | 186 | ${{ !contains(matrix.test_task, 'bundle') && 'RUBYOPT=-w' || '' }}
|
177 | 187 | timeout-minutes: ${{ matrix.timeout || 40 }}
|
|
0 commit comments