Skip to content

Commit 64569da

Browse files
committed
fixup! squash! Update workflows and pre-commit
1 parent 6b21e80 commit 64569da

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ jobs:
3434
# libltdl-dev needed to build libxcrypt sub-dependency, others needed for sdl3
3535
apt-packages: libltdl-dev libx11-dev libxft-dev libxext-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libibus-1.0-dev
3636

37-
env:
38-
# Indicates the CMake build directory where project files and binaries are being produced.
39-
CMAKE_BUILD_DIR: ${{ github.workspace }}/build
40-
4137
steps:
4238
- name: Install APT packages
4339
if: matrix.apt-packages
@@ -57,7 +53,7 @@ jobs:
5753
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
5854
# The other paths starting with '!' are exclusions: they contain temporary files generated during the build of the installed packages.
5955
path: |
60-
${{ env.CMAKE_BUILD_DIR }}/vcpkg_installed/
56+
build/vcpkg_installed/
6157
${{ env.VCPKG_ROOT }}
6258
!${{ env.VCPKG_ROOT }}/buildtrees
6359
!${{ env.VCPKG_ROOT }}/packages
@@ -72,20 +68,20 @@ jobs:
7268
- name: Install dependencies and generate project files
7369
run: cmake
7470
-S "${{ github.workspace }}"
75-
-B "${CMAKE_BUILD_DIR}"
71+
-B build
7672
-G Ninja \
7773
-D VCPKG_TARGET_TRIPLET="${{ matrix.triplet }}" \
7874
-D CMAKE_BUILD_TYPE="${{ env.BUILD_TYPE }}" \
7975
-D UMBRA_DEMO=ON
8076
-D UMBRA_CPACK=ON
8177
# Build the whole project with Ninja (which is spawn by CMake).
8278
- name: Build
83-
run: cmake --build "${CMAKE_BUILD_DIR}"
79+
run: cmake --build build
8480
- name: Show contents of the build directory
85-
run: find "${CMAKE_BUILD_DIR}"
81+
run: find build
8682
# Copy files from the CMake build and data directory into a new distribution folder.
8783
- name: CPack
88-
run: cpack --verbose --config ${{env.CMAKE_BUILD_DIR}}/CPackConfig.cmake -B dist -R `git describe --always`
84+
run: cpack --verbose --config build/CPackConfig.cmake -B dist -R `git describe --always`
8985
# Upload archives as artifacts, these can be downloaded from the GitHub Actions page.
9086
- name: "Upload Artifact"
9187
uses: actions/upload-artifact@v6

0 commit comments

Comments
 (0)