Skip to content

Commit 46c77c2

Browse files
committed
Add Ninja build system support and switch Vulkan SDK archive to .tar.gz
- Integrate `ninja-build` as a required dependency for Unix builds. - Update Vulkan SDK download to use `.tar.gz` format for macOS and adjust extraction steps accordingly. - Modify CMake configuration to use Ninja generator for Unix platforms.
1 parent 638a945 commit 46c77c2

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.github/workflows/workflow.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ jobs:
4444
libglm-dev \
4545
libtinyobjloader-dev \
4646
libstb-dev \
47-
cmake
47+
cmake \
48+
ninja-build
4849
# Build and install yaml-cpp from source
4950
git clone https://github.com/jbeder/yaml-cpp.git
5051
cd yaml-cpp
@@ -151,10 +152,10 @@ jobs:
151152
152153
# Download the SDK
153154
# Use the direct URL format with explicit version
154-
curl -L -o vulkansdk.tar.xz "https://sdk.lunarg.com/sdk/download/$VULKAN_VERSION/mac/vulkansdk-macos-$VULKAN_VERSION.tar.xz"
155+
curl -L -o vulkansdk.tar.gz "https://sdk.lunarg.com/sdk/download/$VULKAN_VERSION/mac/vulkansdk-macos-$VULKAN_VERSION.tar.gz"
155156
156-
# Extract the SDK - use tar with J flag for xz compression
157-
tar -xJf vulkansdk.tar.xz
157+
# Extract the SDK - use tar with z flag for gzip compression
158+
tar -xzf vulkansdk.tar.gz
158159
159160
# Set environment variables
160161
echo "VULKAN_SDK=$PWD/vulkansdk-macos-$VULKAN_VERSION/macOS" >> $GITHUB_ENV
@@ -167,7 +168,7 @@ jobs:
167168
cd ..
168169
deps-install: |
169170
# Install available packages through brew
170-
brew install glfw glm
171+
brew install glfw glm ninja
171172
172173
# Install tinyobjloader from source
173174
git clone https://github.com/tinyobjloader/tinyobjloader.git
@@ -261,7 +262,7 @@ jobs:
261262
- name: Configure CMake (Unix)
262263
working-directory: ${{github.workspace}}/attachments
263264
if: runner.os != 'Windows'
264-
run: cmake -B build -DCMAKE_BUILD_TYPE=Release
265+
run: cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
265266

266267
- name: Build
267268
working-directory: ${{github.workspace}}/attachments

0 commit comments

Comments
 (0)