From 61d1eb9b4e86e252f5f63e1b5fdd63bc9b30e061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Sun, 13 Nov 2022 20:23:01 +0100 Subject: [PATCH] github: Move boost installation to waforthc workflow --- .github/actions/setup/action.yml | 9 +-------- .github/workflows/build-waforthc.yml | 11 +++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 3294629..93edf95 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -7,10 +7,7 @@ runs: node-version: 17 cache: 'yarn' - if: runner.os == 'macOS' - run: brew install wabt boost - shell: bash - - if: runner.os == 'Linux' - run: sudo apt-get install libboost-dev libboost-filesystem-dev libboost-program-options-dev + run: brew install wabt shell: bash - if: runner.os == 'Linux' run: | @@ -25,9 +22,5 @@ runs: mv /tmp/wabt-1.0.30 /c/tools/wabt cp /c/tools/wabt/bin/* /c/Windows/system32 shell: bash - - if: runner.os == 'Windows' - run: | - C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-x86_64-boost - shell: cmd - run: yarnpkg --pure-lockfile shell: bash diff --git a/.github/workflows/build-waforthc.yml b/.github/workflows/build-waforthc.yml index bb03f17..1617878 100644 --- a/.github/workflows/build-waforthc.yml +++ b/.github/workflows/build-waforthc.yml @@ -15,5 +15,16 @@ jobs: steps: - uses: actions/checkout@v2 - uses: ./.github/actions/setup + + - if: runner.os == 'macOS' + run: brew install boost + shell: bash + - if: runner.os == 'Linux' + run: sudo apt-get install libboost-dev libboost-filesystem-dev libboost-program-options-dev + shell: bash + - if: runner.os == 'Windows' + run: C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-x86_64-boost + shell: cmd + - run: make -C src/waforthc package - run: make -C src/waforthc check