From 1880a7182e37e7b1d14b1464eaec76d1ce2407d7 Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Sat, 19 Jun 2021 12:11:10 +0200 Subject: [PATCH] CI: Install libffi which matches running arch (#905) * CI: Install libffi which matches running arch This is because rubyinstaller-head switched to MINGW-UCRT, so the package prefix is mingw-w64-ucrt-x86_64 instead of mingw-w64-x86_64 * fixup --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff5028a07..376c06896 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,10 +16,12 @@ jobs: with: ruby-version: 2.7 - - run: brew install automake libffi pkg-config - if: matrix.os == 'macos' - - run: ridk exec pacman --sync --refresh --needed --noconfirm mingw-w64-x86_64-libffi - if: matrix.os == 'windows' && matrix.extconfopts == '--enable-system-libffi' + - if: matrix.os == 'macos' + run: brew install automake libffi pkg-config + + - if: matrix.os == 'windows' && matrix.extconfopts == '--enable-system-libffi' + shell: cmd + run: ridk exec sh -c "pacman --sync --refresh --needed --noconfirm ${MINGW_PACKAGE_PREFIX}-libffi" - run: bundle install - run: bundle exec rake libffi