Skip to content

Commit 006a219

Browse files
metsmaJakuje
authored andcommitted
Use CI local vcpkg copy and silence CodeQL warnings
Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent 3ede293 commit 006a219

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626

2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030

3131
# Initializes the CodeQL tools for scanning.
3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@v3
33+
uses: github/codeql-action/init@v4
3434
with:
3535
languages: ${{ matrix.language }}
3636
config-file: ./.github/.codeql.yml
@@ -39,7 +39,7 @@ jobs:
3939
- run: .github/build.sh
4040

4141
- name: Upload test logs
42-
uses: actions/upload-artifact@v4
42+
uses: actions/upload-artifact@v5
4343
if: failure()
4444
with:
4545
name: codeql-logs
@@ -48,6 +48,6 @@ jobs:
4848
src/tests/unittests/*.log
4949
5050
- name: Perform CodeQL Analysis
51-
uses: github/codeql-action/analyze@v3
51+
uses: github/codeql-action/analyze@v4
5252
with:
5353
category: "/language:${{matrix.language}}"

.github/workflows/windows.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
env:
3434
OPENPACE_VER: 1.1.3
3535
VCPKG_INSTALLED: ${{ github.workspace }}\vcpkg_installed
36+
VCPKG_DEFAULT_TRIPLET: ${{ matrix.platform }}-windows-static
3637
BUILD_NUMBER: ${{ github.run_number }}
3738
steps:
3839
- name: Checkout
@@ -64,14 +65,12 @@ jobs:
6465
key: vcpkg-${{ matrix.configuration }}-${{ matrix.platform }}-${{ hashFiles('.github/vcpkg.json') }}
6566
- name: Prepare vcpkg
6667
if: matrix.configuration == 'Release'
67-
uses: lukka/run-vcpkg@v11
68-
with:
69-
vcpkgJsonGlob: .github/vcpkg.json
70-
runVcpkgInstall: true
7168
env:
7269
VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
73-
VCPKG_DEFAULT_TRIPLET: ${{ matrix.platform }}-windows-static
74-
VCPKG_INSTALLED_DIR: ${{ env.VCPKG_INSTALLED }}
70+
run: |
71+
C:\vcpkg\vcpkg install `
72+
--x-manifest-root ${{ github.workspace }}/.github `
73+
--x-install-root ${env:VCPKG_INSTALLED}
7574
- name: Install WIX
7675
run: powershell -ExecutionPolicy Bypass -File .github/setup-wix.ps1
7776
- name: Restore Cache

0 commit comments

Comments
 (0)