Skip to content

Commit 10391bb

Browse files
committed
chore(modules): workflow fixes
1 parent cc88694 commit 10391bb

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

.github/workflows/linux.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818

1919
- name: Install Dependencies
2020
run: |
21+
sudo apt-get update
22+
sudo apt-get upgrade
23+
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
2124
sudo apt-get update
2225
sudo apt-get install -yq libgtest-dev libboost-program-options-dev rapidjson-dev ninja-build gcc-14 g++-14
2326

.github/workflows/macos.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,20 @@ jobs:
3030
cmake -E make_directory build
3131
cmake -E make_directory build/vcpkg_cache
3232
33+
- name: Boostrap vcpkg
34+
shell: pwsh
35+
working-directory: vcpkg/
36+
run: |
37+
./bootstrap-vcpkg.sh
38+
./vcpkg integrate install
39+
git fetch
40+
3341
- name: Configure
3442
shell: pwsh
3543
env:
3644
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
3745
working-directory: build/
3846
run: |
39-
& "${env:VCPKG_ROOT}/bootstrap-vcpkg.sh"
40-
& "${env:VCPKG_ROOT}/vcpkg integrate install"
41-
4247
$vcpkgToolchain = Join-Path $env:VCPKG_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
4348
$cmakeBuildType = '${{ matrix.config }}'
4449

.github/workflows/windows.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,20 @@ jobs:
3636
cmake -E make_directory build
3737
cmake -E make_directory build/vcpkg_cache
3838
39+
- name: Boostrap vcpkg
40+
shell: pwsh
41+
working-directory: vcpkg/
42+
run: |
43+
./bootstrap-vcpkg.bat
44+
./vcpkg integrate install
45+
git fetch
46+
3947
- name: Configure
4048
shell: pwsh
4149
env:
4250
VCPKG_ROOT: ${{ github.workspace }}\vcpkg
4351
working-directory: build/
4452
run: |
45-
& "${env:VCPKG_ROOT}/bootstrap-vcpkg.bat"
46-
& "${env:VCPKG_ROOT}/vcpkg" integrate install
47-
4853
$vcpkgToolchain = Join-Path $env:VCPKG_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
4954
$vcpkgTriplet = '${{ steps.set-variables.outputs.vcpkg_triplet }}'
5055
$cmakeSharedLibs = $(if ('${{ matrix.libs }}' -eq 'shared') { 'ON' } else { 'OFF' })

0 commit comments

Comments
 (0)