mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codefix: [CI] Store vcpkg outside the repository folder (#12271) 

Otherwise tools like CodeQL can pick up on vcpkg files.
This commit is contained in:
Patric Stout 2024-03-11 19:53:09 +01:00 committed by GitHub
parent c768f4fc7a
commit d7b99cbe26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ci-linux.yml vendored
View File

@ -42,8 +42,8 @@ jobs:
- name: Install vcpkg - name: Install vcpkg
run: | run: |
git clone https://github.com/microsoft/vcpkg git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
./vcpkg/bootstrap-vcpkg.sh -disableMetrics ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
- name: Install dependencies - name: Install dependencies
run: | run: |
@ -71,7 +71,7 @@ jobs:
# We only use breakpad from vcpkg, as its CMake files # We only use breakpad from vcpkg, as its CMake files
# are a bit special. So the Ubuntu's variant doesn't work. # are a bit special. So the Ubuntu's variant doesn't work.
./vcpkg/vcpkg install breakpad ${{ runner.temp }}/vcpkg/vcpkg install breakpad
echo "::endgroup::" echo "::endgroup::"
env: env:
@ -101,7 +101,7 @@ jobs:
cd build cd build
echo "::group::CMake" 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 "::endgroup::"
echo "::group::Build" echo "::group::Build"

6
.github/workflows/ci-macos.yml vendored
View File

@ -35,8 +35,8 @@ jobs:
- name: Install vcpkg - name: Install vcpkg
run: | run: |
git clone https://github.com/microsoft/vcpkg git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
./vcpkg/bootstrap-vcpkg.sh -disableMetrics ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
- name: Install OpenGFX - name: Install OpenGFX
run: | run: |
@ -65,7 +65,7 @@ jobs:
cmake .. \ cmake .. \
-DCMAKE_OSX_ARCHITECTURES=${{ inputs.full_arch }} \ -DCMAKE_OSX_ARCHITECTURES=${{ inputs.full_arch }} \
-DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-osx \ -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 # EOF
echo "::endgroup::" echo "::endgroup::"

6
.github/workflows/ci-windows.yml vendored
View File

@ -33,8 +33,8 @@ jobs:
- name: Install vcpkg - name: Install vcpkg
run: | run: |
git clone https://github.com/microsoft/vcpkg git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}\vcpkg
.\vcpkg\bootstrap-vcpkg.bat -disableMetrics ${{ runner.temp }}\vcpkg\bootstrap-vcpkg.bat -disableMetrics
- name: Install OpenGFX - name: Install OpenGFX
shell: bash shell: bash
@ -72,7 +72,7 @@ jobs:
cmake .. \ cmake .. \
-GNinja \ -GNinja \
-DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-windows-static \ -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 # EOF
echo "::endgroup::" echo "::endgroup::"

8
.github/workflows/codeql.yml vendored
View File

@ -36,8 +36,8 @@ jobs:
- name: Install vcpkg - name: Install vcpkg
run: | run: |
git clone https://github.com/microsoft/vcpkg git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
./vcpkg/bootstrap-vcpkg.sh -disableMetrics ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
- name: Install dependencies - name: Install dependencies
run: | run: |
@ -65,7 +65,7 @@ jobs:
# We only use breakpad from vcpkg, as its CMake files # We only use breakpad from vcpkg, as its CMake files
# are a bit special. So the Ubuntu's variant doesn't work. # are a bit special. So the Ubuntu's variant doesn't work.
./vcpkg/vcpkg install breakpad ${{ runner.temp }}/vcpkg/vcpkg install breakpad
echo "::endgroup::" echo "::endgroup::"
env: env:
@ -77,7 +77,7 @@ jobs:
cd build cd build
echo "::group::CMake" 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::" echo "::endgroup::"
- name: Initialize CodeQL - name: Initialize CodeQL

8
.github/workflows/release-macos.yml vendored
View File

@ -42,8 +42,8 @@ jobs:
- name: Install vcpkg - name: Install vcpkg
run: | run: |
git clone https://github.com/microsoft/vcpkg git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}/vcpkg
./vcpkg/bootstrap-vcpkg.sh -disableMetrics ${{ runner.temp }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics
- name: Install dependencies - name: Install dependencies
env: env:
@ -99,7 +99,7 @@ jobs:
cmake ${GITHUB_WORKSPACE} \ cmake ${GITHUB_WORKSPACE} \
-DCMAKE_OSX_ARCHITECTURES=arm64 \ -DCMAKE_OSX_ARCHITECTURES=arm64 \
-DVCPKG_TARGET_TRIPLET=arm64-osx \ -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 \ -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \ -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \
@ -120,7 +120,7 @@ jobs:
cmake ${GITHUB_WORKSPACE} \ cmake ${GITHUB_WORKSPACE} \
-DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-DVCPKG_TARGET_TRIPLET=x64-osx \ -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 \ -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \ -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \

8
.github/workflows/release-windows.yml vendored
View File

@ -55,8 +55,8 @@ jobs:
- name: Install vcpkg - name: Install vcpkg
run: | run: |
git clone https://github.com/microsoft/vcpkg git clone https://github.com/microsoft/vcpkg ${{ runner.temp }}\vcpkg
.\vcpkg\bootstrap-vcpkg.bat -disableMetrics ${{ runner.temp }}\vcpkg\bootstrap-vcpkg.bat -disableMetrics
- name: Install dependencies - name: Install dependencies
shell: bash shell: bash
@ -126,7 +126,7 @@ jobs:
cmake ${GITHUB_WORKSPACE} \ cmake ${GITHUB_WORKSPACE} \
-GNinja \ -GNinja \
-DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \ -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 \ -DOPTION_USE_NSIS=ON \
-DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \ -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@ -152,7 +152,7 @@ jobs:
cmake ${GITHUB_WORKSPACE} \ cmake ${GITHUB_WORKSPACE} \
-GNinja \ -GNinja \
-DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \ -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 \ -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \ -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \