Skip to content

Commit cc88694

Browse files
committed
chore(modules): add vcpkg submodule and update workflows
1 parent b152a94 commit cc88694

File tree

5 files changed

+21
-6
lines changed

5 files changed

+21
-6
lines changed

.github/workflows/linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Install Dependencies
2020
run: |
2121
sudo apt-get update
22-
sudo apt-get install -yq libgtest-dev libboost-program-options-dev rapidjson-dev ninja-build gcc-10 g++-10
22+
sudo apt-get install -yq libgtest-dev libboost-program-options-dev rapidjson-dev ninja-build gcc-14 g++-14
2323
2424
- name: Build GTest
2525
run: |
@@ -35,8 +35,8 @@ jobs:
3535
- name: Configure CMake
3636
shell: pwsh
3737
env:
38-
CC: gcc-10
39-
CXX: g++-10
38+
CC: gcc-14
39+
CXX: g++-14
4040
working-directory: build/
4141
run: |
4242
$cmakeBuildType = '${{ matrix.config }}'

.github/workflows/macos.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ jobs:
99
matrix:
1010
config: [Debug, Release]
1111

12-
runs-on: macos-13
12+
runs-on: macos-latest
1313

1414
steps:
1515
- uses: actions/checkout@v4.1.3
1616
with:
1717
submodules: true
18+
- uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401
1819

1920
- name: Cache vcpkg
2021
uses: actions/cache@v4.0.2
@@ -31,9 +32,14 @@ jobs:
3132
3233
- name: Configure
3334
shell: pwsh
35+
env:
36+
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
3437
working-directory: build/
3538
run: |
36-
$vcpkgToolchain = Join-Path $env:VCPKG_INSTALLATION_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
39+
& "${env:VCPKG_ROOT}/bootstrap-vcpkg.sh"
40+
& "${env:VCPKG_ROOT}/vcpkg integrate install"
41+
42+
$vcpkgToolchain = Join-Path $env:VCPKG_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
3743
$cmakeBuildType = '${{ matrix.config }}'
3844
3945
$cachedBinaries = Join-Path $(Get-Location) './vcpkg_cache/' -Resolve

.github/workflows/windows.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,14 @@ jobs:
3838
3939
- name: Configure
4040
shell: pwsh
41+
env:
42+
VCPKG_ROOT: ${{ github.workspace }}\vcpkg
4143
working-directory: build/
4244
run: |
43-
$vcpkgToolchain = Join-Path $env:VCPKG_INSTALLATION_ROOT '.\scripts\buildsystems\vcpkg.cmake' -Resolve
45+
& "${env:VCPKG_ROOT}/bootstrap-vcpkg.bat"
46+
& "${env:VCPKG_ROOT}/vcpkg" integrate install
47+
48+
$vcpkgToolchain = Join-Path $env:VCPKG_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
4449
$vcpkgTriplet = '${{ steps.set-variables.outputs.vcpkg_triplet }}'
4550
$cmakeSharedLibs = $(if ('${{ matrix.libs }}' -eq 'shared') { 'ON' } else { 'OFF' })
4651
$msbuildArch = $(if ('${{ matrix.arch }}' -eq 'x64') { 'X64' } else { 'Win32' })

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "PEGTL"]
22
path = PEGTL
33
url = https://github.com/taocpp/PEGTL.git
4+
[submodule "vcpkg"]
5+
path = vcpkg
6+
url = https://github.com/microsoft/vcpkg.git

vcpkg

Submodule vcpkg added at 49e1e8f

0 commit comments

Comments
 (0)