Skip to content

Commit 448d77f

Browse files
committed
General Changes
1 parent 4a2f83a commit 448d77f

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,30 +42,28 @@ jobs:
4242
if: matrix.os == 'ubuntu-latest'
4343
run: sudo apt-get install libltdl-dev
4444
shell: bash
45+
46+
- name: Install x11
47+
if: matrix.os == 'ubuntu-latest'
48+
run: sudo apt install libx11-dev libxft-dev libxext-dev
49+
shell: bash
4550

4651
- name: Setup vcpkg
4752
uses: lukka/run-vcpkg@v11
4853
id: runvcpkg
4954
with:
5055
vcpkgArguments: '@vcpkg.json'
5156

52-
- name: List $RUNNER_WORKSPACE before build
53-
run: find $RUNNER_WORKSPACE
54-
shell: bash
55-
- name: Prints output of run-vcpkg's action.
56-
run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' "
5757
- name: Run CMake+vcpkg+Ninja
5858
uses: lukka/run-cmake@v10
5959
id: runcmake
6060
with:
6161
cmakeListsTxtPath: 'CMakeLists.txt'
6262
configurePreset: 'ninja-multi-vcpkg'
6363
buildPreset: 'ninja-multi-vcpkg'
64-
- name: List $RUNNER_WORKSPACE after build
65-
run: find $RUNNER_WORKSPACE
66-
shell: bash
64+
6765
- name: Upload build directory
6866
uses: actions/upload-artifact@v4
6967
with:
70-
name: build-${{ matrix.os }}-${{ github.workflow }}
71-
path: builds
68+
name: build-${{ matrix.os }} - Build (No Assets)
69+
path: builds/ninja-multi-vcpkg/Debug/

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[![hosted-ninja-vcpkg_submod-cacheoff](https://github.com/Kade-github/EncounterMaster/actions/workflows/cmake.yml/badge.svg)](https://github.com/Kade-github/EncounterMaster/actions/workflows/cmake.yml)

0 commit comments

Comments
 (0)