From d7b99cbe266a02e022f1ac4792bad8ed2c2b19a5 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Mon, 11 Mar 2024 19:53:09 +0100 Subject: [PATCH] Codefix: [CI] Store vcpkg outside the repository folder (#12271) Otherwise tools like CodeQL can pick up on vcpkg files. --- .github/workflows/ci-linux.yml | 8 ++++---- .github/workflows/ci-macos.yml | 6 +++--- .github/workflows/ci-windows.yml | 6 +++--- .github/workflows/codeql.yml | 8 ++++---- .github/workflows/release-macos.yml | 8 ++++---- .github/workflows/release-windows.yml | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 61b96a32cc..bfe345412a 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -42,8 +42,8 @@ jobs: - name: Install vcpkg run: | - git clone https://github.com/microsoft/vcpkg - ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg + ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics - name: Install dependencies run: | @@ -71,7 +71,7 @@ jobs: # We only use breakpad from vcpkg, as its CMake files # are a bit special. So the Ubuntu's variant doesn't work. - ./vcpkg/vcpkg install breakpad + ${{ runner.temp }}/vcpkg/vcpkg install breakpad echo "::endgroup::" env: @@ -101,7 +101,7 @@ jobs: cd build echo "::group::CMake" - cmake .. -DCMAKE_TOOLCHAIN_FILE=${GITHUB_WORKSPACE}/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ inputs.extra-cmake-parameters }} + cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ inputs.extra-cmake-parameters }} echo "::endgroup::" echo "::group::Build" diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 025580e8c6..f4f30a606b 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -35,8 +35,8 @@ jobs: - name: Install vcpkg run: | - git clone https://github.com/microsoft/vcpkg - ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg + ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics - name: Install OpenGFX run: | @@ -65,7 +65,7 @@ jobs: cmake .. \ -DCMAKE_OSX_ARCHITECTURES=${{ inputs.full_arch }} \ -DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-osx \ - -DCMAKE_TOOLCHAIN_FILE=${GITHUB_WORKSPACE}/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ # EOF echo "::endgroup::" diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 3411581d3d..b748e8db2e 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -33,8 +33,8 @@ jobs: - name: Install vcpkg run: | - git clone https://github.com/microsoft/vcpkg - .\vcpkg\bootstrap-vcpkg.bat -disableMetrics + git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}\vcpkg + ${{ runner.temp }}\vcpkg\bootstrap-vcpkg.bat -disableMetrics - name: Install OpenGFX shell: bash @@ -72,7 +72,7 @@ jobs: cmake .. \ -GNinja \ -DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-windows-static \ - -DCMAKE_TOOLCHAIN_FILE="${GITHUB_WORKSPACE}\vcpkg\scripts\buildsystems\vcpkg.cmake" \ + -DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \ # EOF echo "::endgroup::" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index fe63c43d9f..4d10111a4e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -36,8 +36,8 @@ jobs: - name: Install vcpkg run: | - git clone https://github.com/microsoft/vcpkg - ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg + ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics - name: Install dependencies run: | @@ -65,7 +65,7 @@ jobs: # We only use breakpad from vcpkg, as its CMake files # are a bit special. So the Ubuntu's variant doesn't work. - ./vcpkg/vcpkg install breakpad + ${{ runner.temp }}/vcpkg/vcpkg install breakpad echo "::endgroup::" env: @@ -77,7 +77,7 @@ jobs: cd build echo "::group::CMake" - cmake .. -DCMAKE_TOOLCHAIN_FILE=${GITHUB_WORKSPACE}/vcpkg/scripts/buildsystems/vcpkg.cmake + cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake echo "::endgroup::" - name: Initialize CodeQL diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 38170e1a6a..afaad467a9 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -42,8 +42,8 @@ jobs: - name: Install vcpkg run: | - git clone https://github.com/microsoft/vcpkg - ./vcpkg/bootstrap-vcpkg.sh -disableMetrics + git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg + ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics - name: Install dependencies env: @@ -99,7 +99,7 @@ jobs: cmake ${GITHUB_WORKSPACE} \ -DCMAKE_OSX_ARCHITECTURES=arm64 \ -DVCPKG_TARGET_TRIPLET=arm64-osx \ - -DCMAKE_TOOLCHAIN_FILE=${GITHUB_WORKSPACE}/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \ @@ -120,7 +120,7 @@ jobs: cmake ${GITHUB_WORKSPACE} \ -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DVCPKG_TARGET_TRIPLET=x64-osx \ - -DCMAKE_TOOLCHAIN_FILE=${GITHUB_WORKSPACE}/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \ diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 93dfce6498..a574a28f01 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -55,8 +55,8 @@ jobs: - name: Install vcpkg run: | - git clone https://github.com/microsoft/vcpkg - .\vcpkg\bootstrap-vcpkg.bat -disableMetrics + git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}\vcpkg + ${{ runner.temp }}\vcpkg\bootstrap-vcpkg.bat -disableMetrics - name: Install dependencies shell: bash @@ -126,7 +126,7 @@ jobs: cmake ${GITHUB_WORKSPACE} \ -GNinja \ -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \ - -DCMAKE_TOOLCHAIN_FILE="${GITHUB_WORKSPACE}\vcpkg\scripts\buildsystems\vcpkg.cmake" \ + -DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \ -DOPTION_USE_NSIS=ON \ -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -152,7 +152,7 @@ jobs: cmake ${GITHUB_WORKSPACE} \ -GNinja \ -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \ - -DCMAKE_TOOLCHAIN_FILE="${GITHUB_WORKSPACE}\vcpkg\scripts\buildsystems\vcpkg.cmake" \ + -DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \ -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \