From a5796a3b9b53b10fa63115ce566e7326fe52156f Mon Sep 17 00:00:00 2001 From: Roman Fomin Date: Thu, 5 Sep 2024 22:01:04 +0700 Subject: [PATCH] simplify --- .github/workflows/packages.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index eb24932ab..324a753ad 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -74,11 +74,6 @@ jobs: core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - - name: Setup vcpkg - shell: bash - run: | - echo "VCPKG_ROOT=${VCPKG_INSTALLATION_ROOT}" >> $GITHUB_ENV - - name: Update vcpkg (Linux) if: runner.os == 'Linux' run: | @@ -93,7 +88,7 @@ jobs: cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_WERROR=ON -DENABLE_HARDENING=ON -DENABLE_LTO=ON - -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" + -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_TRIPLETS="cmake/triplets" -DVCPKG_TARGET_TRIPLET=${{ matrix.config.triplet }} ${{ matrix.config.extra-options }}