diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bda07c9..9477d53d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,7 @@ on: pull_request: env: + BOOST_VERSION: 1.83.0 CARGO_TERM_COLOR: always MSVC_CONFIG: RelWithDebInfo @@ -38,9 +39,13 @@ jobs: echo "version=$LIBLOOT_SAFE_DESC_REF" >> $GITHUB_OUTPUT - name: Download Boost + id: get-boost run: | - wget https://boostorg.jfrog.io/artifactory/main/release//1.81.0/source/boost_1_81_0.tar.gz - tar -xf boost_1_81_0.tar.gz + BOOST_BASENAME=boost_${BOOST_VERSION//./_} + wget https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/${BOOST_BASENAME}.tar.gz + tar -xf ${BOOST_BASENAME}.tar.gz + + echo "root=${BOOST_BASENAME}" >> $GITHUB_OUTPUT - name: Get ICU id: get-icu @@ -57,7 +62,6 @@ jobs: doxygen \ language-pack-el \ language-pack-tr \ - libicu-dev \ libtbb-dev \ g++-10 @@ -66,7 +70,7 @@ jobs: mkdir build cd build export CXX="g++-10" CC="gcc-10" - cmake .. -DBOOST_ROOT="boost_1_81_0" -DICU_ROOT="${{ steps.get-icu.outputs.root }}" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" + cmake .. -DBOOST_ROOT="${{ steps.get-boost.outputs.root }}" -DICU_ROOT="${{ steps.get-icu.outputs.root }}" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" make all - name: Run tests @@ -140,9 +144,13 @@ jobs: run: rustup target add i686-pc-windows-msvc - name: Download Boost + id: get-boost run: | - curl -sSfLO https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.7z - 7z x boost_1_81_0.7z + $BOOST_BASENAME="boost_" + $env:BOOST_VERSION -replace "\.", "_" + curl -sSfLO "https://boostorg.jfrog.io/artifactory/main/release/${env:BOOST_VERSION}/source/${BOOST_BASENAME}.7z" + 7z x "${BOOST_BASENAME}.7z" + + echo "root=$BOOST_BASENAME" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append - name: Get descriptive libloot version id: get-libloot-version @@ -157,7 +165,7 @@ jobs: run: | mkdir build cd build - cmake .. -G "Visual Studio 16 2019" -A ${{ matrix.platform }} -DBOOST_ROOT="boost_1_81_0" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" + cmake .. -G "Visual Studio 16 2019" -A ${{ matrix.platform }} -DBOOST_ROOT="${{ steps.get-boost.outputs.root }}" -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 e681aec9..6e949144 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,7 @@ on: tags: '*' env: + BOOST_VERSION: 1.83.0 CARGO_TERM_COLOR: always MSVC_CONFIG: RelWithDebInfo @@ -55,9 +56,13 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Download Boost + id: get-boost run: | - wget https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.gz - tar -xf boost_1_81_0.tar.gz + BOOST_BASENAME=boost_${BOOST_VERSION//./_} + wget https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/${BOOST_BASENAME}.tar.gz + tar -xf ${BOOST_BASENAME}.tar.gz + + echo "root=${BOOST_BASENAME}" >> $GITHUB_OUTPUT - name: Get ICU id: get-icu @@ -74,7 +79,6 @@ jobs: doxygen \ language-pack-el \ language-pack-tr \ - libicu-dev \ libtbb-dev \ g++-10 @@ -83,7 +87,7 @@ jobs: mkdir build cd build export CXX="g++-10" CC="gcc-10" - cmake .. -DBOOST_ROOT="boost_1_81_0" -DICU_ROOT="${{ steps.get-icu.outputs.root }}" -DCPACK_PACKAGE_VERSION="${{ needs.create_release.outputs.git_tag }}" + cmake .. -DBOOST_ROOT="${{ steps.get-boost.outputs.root }}" -DICU_ROOT="${{ steps.get-icu.outputs.root }}" -DCPACK_PACKAGE_VERSION="${{ needs.create_release.outputs.git_tag }}" make all - name: Run tests @@ -151,15 +155,19 @@ jobs: run: rustup target add i686-pc-windows-msvc - name: Download Boost + id: get-boost run: | - curl -sSfLO https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.7z - 7z x boost_1_81_0.7z + $BOOST_BASENAME="boost_" + $env:BOOST_VERSION -replace "\.", "_" + curl -sSfLO "https://boostorg.jfrog.io/artifactory/main/release/${env:BOOST_VERSION}/source/${BOOST_BASENAME}.7z" + 7z x "${BOOST_BASENAME}.7z" + + echo "root=$BOOST_BASENAME" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append - name: Run CMake run: | mkdir build cd build - cmake .. -G "Visual Studio 16 2019" -A ${{ matrix.platform }} -DBOOST_ROOT="boost_1_81_0" -DCPACK_PACKAGE_VERSION="${{ needs.create_release.outputs.git_tag }}" + cmake .. -G "Visual Studio 16 2019" -A ${{ matrix.platform }} -DBOOST_ROOT="${{ steps.get-boost.outputs.root }}" -DCPACK_PACKAGE_VERSION="${{ needs.create_release.outputs.git_tag }}" cmake --build . --config ${{ env.MSVC_CONFIG }} - uses: actions/setup-python@v4