Skip to content

Commit a977fdb

Browse files
committed
ci: install only the runner a target needs, without recommends, and bound the step
1 parent d734d65 commit a977fdb

1 file changed

Lines changed: 18 additions & 5 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,27 @@ jobs:
209209
mcpp --version
210210
mcpp self config --mirror GLOBAL
211211
212-
- name: Install the runners
212+
# Only what the target needs, and without recommends: wine64 with them is
213+
# a desktop's worth of packages, and one run spent the job's whole budget
214+
# in this step. The Windows headers are the ones openkal-windows builds
215+
# against; the compilers are mcpp's.
216+
- name: Install the runner
213217
if: matrix.target == 'x86_64-windows-musl' || matrix.target == 'aarch64-linux-musl'
218+
timeout-minutes: 15
219+
env:
220+
DEBIAN_FRONTEND: noninteractive
214221
run: |
215222
sudo apt-get update -qq
216-
sudo apt-get install -y -qq mingw-w64 wine64 qemu-user > /dev/null
217-
command -v wine || sudo ln -s "$(command -v wine64)" /usr/local/bin/wine
218-
wine --version
219-
qemu-aarch64 --version | head -1
223+
case '${{ matrix.target }}' in
224+
x86_64-windows-musl)
225+
sudo apt-get install -y -qq --no-install-recommends mingw-w64-x86-64-dev wine64 > /dev/null
226+
ls /usr/x86_64-w64-mingw32/include/windows.h
227+
command -v wine || sudo ln -s "$(command -v wine64)" /usr/local/bin/wine
228+
wine --version ;;
229+
aarch64-linux-musl)
230+
sudo apt-get install -y -qq --no-install-recommends qemu-user > /dev/null
231+
qemu-aarch64 --version | head -1 ;;
232+
esac
220233
221234
- name: Cache mcpp sandbox
222235
uses: actions/cache@v4

0 commit comments

Comments
 (0)