Skip to content

Commit

Permalink
Fix for build failure
Browse files Browse the repository at this point in the history
Don't use lukka/run-vcpkg or lukka/run-cmake, just use shell commands.
  • Loading branch information
hyperlogic committed Apr 11, 2024
1 parent c7ea429 commit df6ca7f
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
27 changes: 16 additions & 11 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Install System Packages
uses: ConorMacBride/install-package@v1
with:
apt: libgl-dev libxcb-glx0-dev libglu1-mesa-dev libxxf86vm-dev libxrandr-dev
apt: libxmu-dev libxi-dev libgl-dev libxcb-glx0-dev libglu1-mesa-dev libxxf86vm-dev libxrandr-dev
- name: Install CMake
uses: lukka/get-cmake@latest
- name: Install Vcpkg Packages
Expand All @@ -35,17 +35,22 @@ jobs:
uses: ilammy/msvc-dev-cmd@v1
- name: Install CMake
uses: lukka/get-cmake@latest
- name: Install Vcpkg Packages
uses: lukka/run-vcpkg@v11
with:
vcpkgJsonGlob: 'vcpkg.json'
- name: Configure and Build
uses: lukka/run-cmake@v10
with:
configurePreset: 'msvc-vcpkg'
buildPreset: 'msvc-vcpkg-release'
- name: bootstrap vcpkg
working-directory: vcpkg
run: bootstrap-vcpkg.bat
- name: vcpkg install (manifest mode)
shell: cmd
run: vcpkg\vcpkg.exe install
- name: create build dir
run: mkdir build
- name: cmake configure
working-directory: build
run: cmake -DSHIPPING=ON -DCMAKE_TOOLCHAIN_FILE="../vcpkg/scripts/buildsystems/vcpkg.cmake" ..
- name: cmake build
working-directory: build
run: cmake --build . config=Release
- name: Upload Artifiacts
uses: actions/upload-artifact@v4
with:
name: windows-build
path: builds/msvc-vcpkg/Release
path: build/Release
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ meta-quest/ovr_openxr_mobile_sdk_59.0.zip
data/*
!data/test.ply
!data/test_vr.json
vcpkg_installed/

# ignore archived release zip
splatapult*.zip
2 changes: 1 addition & 1 deletion vcpkg
Submodule vcpkg updated 1367 files

0 comments on commit df6ca7f

Please sign in to comment.