Skip to content

Commit 6200293

Browse files
committed
Remove macOS build from CI workflow and enable C++ module scanning in CMake
- Drop macOS-specific steps from the GitHub Actions workflow to streamline CI processes. - Enable `CMAKE_CXX_SCAN_FOR_MODULES` in CMake configuration for improved support of C++ module dependencies.
1 parent 46c77c2 commit 6200293

File tree

2 files changed

+4
-70
lines changed

2 files changed

+4
-70
lines changed

.github/workflows/workflow.yml

Lines changed: 1 addition & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [ubuntu-latest, windows-latest, macos-latest]
14+
os: [ubuntu-latest, windows-latest]
1515
include:
1616
- os: ubuntu-latest
1717
vulkan-install: |
@@ -137,74 +137,6 @@ jobs:
137137
echo "31_compute_shader build failed"
138138
exit 1
139139
}
140-
- os: macos-latest
141-
vulkan-install: |
142-
# Install MoltenVK (Vulkan implementation for macOS)
143-
brew install molten-vk
144-
145-
# Get the latest SDK version
146-
VULKAN_VERSION=$(curl -s https://vulkan.lunarg.com/sdk/latest/mac.txt)
147-
echo "Using Vulkan SDK version: $VULKAN_VERSION"
148-
149-
# Create a temporary directory for the SDK
150-
mkdir -p vulkan-sdk
151-
cd vulkan-sdk
152-
153-
# Download the SDK
154-
# Use the direct URL format with explicit version
155-
curl -L -o vulkansdk.tar.gz "https://sdk.lunarg.com/sdk/download/$VULKAN_VERSION/mac/vulkansdk-macos-$VULKAN_VERSION.tar.gz"
156-
157-
# Extract the SDK - use tar with z flag for gzip compression
158-
tar -xzf vulkansdk.tar.gz
159-
160-
# Set environment variables
161-
echo "VULKAN_SDK=$PWD/vulkansdk-macos-$VULKAN_VERSION/macOS" >> $GITHUB_ENV
162-
echo "PATH=$PWD/vulkansdk-macos-$VULKAN_VERSION/macOS/bin:$PATH" >> $GITHUB_ENV
163-
echo "DYLD_LIBRARY_PATH=$PWD/vulkansdk-macos-$VULKAN_VERSION/macOS/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
164-
echo "VK_LAYER_PATH=$PWD/vulkansdk-macos-$VULKAN_VERSION/macOS/share/vulkan/explicit_layer.d" >> $GITHUB_ENV
165-
echo "VK_ICD_FILENAMES=$PWD/vulkansdk-macos-$VULKAN_VERSION/macOS/share/vulkan/icd.d/MoltenVK_icd.json" >> $GITHUB_ENV
166-
167-
# Return to the original directory
168-
cd ..
169-
deps-install: |
170-
# Install available packages through brew
171-
brew install glfw glm ninja
172-
173-
# Install tinyobjloader from source
174-
git clone https://github.com/tinyobjloader/tinyobjloader.git
175-
cd tinyobjloader
176-
cmake -B build -DCMAKE_BUILD_TYPE=Release
177-
cmake --build build --config Release
178-
sudo cmake --install build
179-
cd ..
180-
181-
# Install stb headers
182-
git clone https://github.com/nothings/stb.git
183-
sudo mkdir -p /usr/local/include/stb
184-
sudo cp stb/*.h /usr/local/include/stb/
185-
186-
test-cmd: |
187-
# Check if some of the expected executables were built
188-
if [ -f "00_base_code/00_base_code" ]; then
189-
echo "00_base_code built successfully"
190-
else
191-
echo "00_base_code build failed"
192-
exit 1
193-
fi
194-
195-
if [ -f "15_hello_triangle/15_hello_triangle" ]; then
196-
echo "15_hello_triangle built successfully"
197-
else
198-
echo "15_hello_triangle build failed"
199-
exit 1
200-
fi
201-
202-
if [ -f "31_compute_shader/31_compute_shader" ]; then
203-
echo "31_compute_shader built successfully"
204-
else
205-
echo "31_compute_shader build failed"
206-
exit 1
207-
fi
208140
209141
runs-on: ${{ matrix.os }}
210142

@@ -217,7 +149,6 @@ jobs:
217149
path: |
218150
~/.cache/pip
219151
~/.vcpkg
220-
~/Library/Caches/Homebrew
221152
${{ env.VCPKG_INSTALLATION_ROOT }}
222153
key: ${{ runner.os }}-deps-${{ hashFiles('**/CMakeLists.txt') }}
223154
restore-keys: |

attachments/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
cmake_minimum_required (VERSION 3.29)
22

3+
# Enable C++ module dependency scanning
4+
set(CMAKE_CXX_SCAN_FOR_MODULES ON)
5+
36
project (VulkanTutorial)
47

58
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")

0 commit comments

Comments
 (0)