Skip to content

Commit 84ef2f6

Browse files
committed
Fix: Use shell syntax for SETARCH command
1 parent 2430f5f commit 84ef2f6

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/modgc.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ jobs:
101101
- name: Run configure
102102
env:
103103
arch: ${{ matrix.arch }}
104-
run: >-
105-
$SETARCH ../src/configure -C --disable-install-doc --with-modular-gc="${MODULAR_GC_DIR}"
104+
run: |
105+
${SETARCH} ../src/configure -C --disable-install-doc --with-modular-gc="${MODULAR_GC_DIR}" \
106106
${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE}
107107
108108
- uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
@@ -112,15 +112,15 @@ jobs:
112112
echo 'MSPECOPT=-B../src/spec/mmtk.mspec' >> $GITHUB_ENV
113113
if: ${{ matrix.gc.name == 'mmtk' }}
114114

115-
- run: $SETARCH make
115+
- run: ${SETARCH} make
116116

117117
- name: Build Modular GC
118118
run: |
119119
echo "RUBY_GC_LIBRARY=${{ matrix.gc.name }}" >> $GITHUB_ENV
120120
make install-modular-gc MODULAR_GC=${{ matrix.gc.name }} MMTK_BUILD=${{ matrix.gc.mmtk_build }}
121121
make distclean-modular-gc MODULAR_GC=${{ matrix.gc.name }}
122122
123-
- run: $SETARCH make hello
123+
- run: ${SETARCH} make hello
124124

125125
- name: Set test options for skipped tests
126126
run: |
@@ -146,7 +146,7 @@ jobs:
146146
test -n "${LAUNCHABLE_STDOUT}" && exec 1> >(tee "${LAUNCHABLE_STDOUT}")
147147
test -n "${LAUNCHABLE_STDERR}" && exec 2> >(tee "${LAUNCHABLE_STDERR}")
148148
149-
$SETARCH make -s ${{ matrix.test_task }} \
149+
${SETARCH} make -s ${{ matrix.test_task }} \
150150
${TESTS:+TESTS="$TESTS"} \
151151
${{ !contains(matrix.test_task, 'bundle') && 'RUBYOPT=-w' || '' }}
152152
timeout-minutes: ${{ matrix.gc.timeout || 40 }}
@@ -159,7 +159,7 @@ jobs:
159159

160160
- name: make skipped tests
161161
run: |
162-
$SETARCH make -s test-all TESTS="${TESTS//-n!\//-n/}"
162+
${SETARCH} make -s test-all TESTS="${TESTS//-n!\//-n/}"
163163
env:
164164
GNUMAKEFLAGS: ''
165165
RUBY_TESTOPTS: '-v --tty=no'

0 commit comments

Comments
 (0)