From 26b457f7cb2dfa9385327d30e4f5e25dba07e41f Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Thu, 11 Mar 2021 19:22:11 +0000 Subject: [PATCH] Download and extract Boost archive in CI GitHub has removed Boost 1.72.0 from its runners, and libloot only needs the Boost headers, so download and extract them for the build. --- .github/workflows/ci.yml | 14 ++++++++++++-- .github/workflows/release.yml | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b52d8a9..94ccb0dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,6 +98,11 @@ jobs: LIBLOOT_SAFE_DESC_REF=${LIBLOOT_DESC_REF//[\/<>\"|]/_} echo "::set-output name=version::$LIBLOOT_SAFE_DESC_REF" + - name: Download Boost + run: | + wget https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz + tar -xf boost_1_72_0.tar.gz + - name: Install APT package dependencies run: | sudo apt-get update @@ -117,7 +122,7 @@ jobs: mkdir build cd build export CXX="g++-8" CC="gcc-8" - cmake .. -DBOOST_ROOT="$BOOST_ROOT_1_72_0" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" + cmake .. -DBOOST_ROOT="boost_1_72_0" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" make all - name: Run tests @@ -185,6 +190,11 @@ jobs: - name: Install Rust i686-pc-windows-msvc target run: rustup target add i686-pc-windows-msvc + - name: Download Boost + run: | + curl -sSfLO https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.7z + 7z x boost_1_72_0.7z + - name: Get descriptive libloot version id: get-libloot-version shell: bash @@ -198,7 +208,7 @@ jobs: run: | mkdir build cd build - cmake .. -G "Visual Studio 15 2017" -A ${{ matrix.platform }} -DBOOST_ROOT="${env:BOOST_ROOT_1_72_0}" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" + cmake .. -G "Visual Studio 15 2017" -A ${{ matrix.platform }} -DBOOST_ROOT="boost_1_72_0" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" cmake --build . --config ${{ env.MSVC_CONFIG }} - name: Run tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62675049..eeeb1361 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,6 +63,11 @@ jobs: LIBLOOT_SAFE_DESC_REF=${LIBLOOT_DESC_REF//[\/<>\"|]/_} echo "::set-output name=version::$LIBLOOT_SAFE_DESC_REF" + - name: Download Boost + run: | + wget https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz + tar -xf boost_1_72_0.tar.gz + - name: Install APT package dependencies run: | sudo apt-get update @@ -82,7 +87,7 @@ jobs: mkdir build cd build export CXX="g++-8" CC="gcc-8" - cmake .. -DBOOST_ROOT="$BOOST_ROOT_1_72_0" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" + cmake .. -DBOOST_ROOT="boost_1_72_0" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" make all - name: Run tests @@ -147,6 +152,11 @@ jobs: - name: Install Rust i686-pc-windows-msvc target run: rustup target add i686-pc-windows-msvc + - name: Download Boost + run: | + curl -sSfLO https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.7z + 7z x boost_1_72_0.7z + - name: Get descriptive libloot version id: get-libloot-version shell: bash @@ -160,7 +170,7 @@ jobs: run: | mkdir build cd build - cmake .. -G "Visual Studio 15 2017" -A ${{ matrix.platform }} -DBOOST_ROOT="${env:BOOST_ROOT_1_72_0}" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" + cmake .. -G "Visual Studio 15 2017" -A ${{ matrix.platform }} -DBOOST_ROOT="boost_1_72_0" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" cmake --build . --config ${{ env.MSVC_CONFIG }} - name: Install packages for building docs