try macos build on runner

alsed · Jun 15, 2024 · b045ab8 · b045ab8
1 parent 2e638a9
commit b045ab8
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -11,13 +11,16 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [windows, ubuntu]
+        os: [windows, ubuntu, macos]
         include:
           - os: windows
             preset: windows-release
-            package: windows-release
+            # package: windows-release
           - os: ubuntu
             preset: linux-vcpkg
+          - os: macos
+            preset: macos-vcpkg
+
     runs-on: ${{ matrix.os }}-latest
     name: ${{ github.workflow }}-${{ matrix.os }}
 
@@ -51,6 +54,11 @@ jobs:
       - name: Prints output of run-vcpkg's action.
         run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' "
 
+      - name: Install dependencies on macos
+        if: ${{ startsWith(matrix.os, 'macos') }}
+        id: macos-deps
+        run: brew install sdl
+
       - name: Run CMake and CPack
         uses: lukka/run-cmake@v10
         id: runcmake
@@ -60,6 +68,10 @@ jobs:
           buildPreset: ${{ matrix.preset }}
           packagePreset: ${{ matrix.package }}
 
+      - name: List $RUNNER_WORKSPACE after build
+        run: find $RUNNER_WORKSPACE
+        shell: bash
+
       - name: Read output package name
         if: ${{ matrix.package }}
         id: readpkg

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -91,6 +91,27 @@
                 "vcpkg",
                 "linux"
             ]
+        },
+        {
+            "name": "macos",
+            "displayName": "macos build",
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Darwin"
+            }
+        },
+        {
+            "name": "macos-vcpkg",
+            "displayName": "Macos vcpkg debug build",
+            "inherits": [
+                "debug",
+                "macos",
+                "vcpkg"
+            ],
+            "cacheVariables": {
+                "VCPKG_OVERLAY_PORTS": "./vcpkg-ports/sdl1"
+            }
         }
     ],
     "buildPresets": [
@@ -113,6 +134,11 @@
             "name": "linux-vcpkg",
             "displayName": "Linux vcpkg build",
             "configurePreset": "linux-vcpkg"
+        },
+        {
+            "name": "macos-vcpkg",
+            "displayName": "Macos vcpkg build",
+            "configurePreset": "macos-vcpkg"
         }
     ],
     "packagePresets": [

diff --git a/vcpkg-ports/sdl1/portfile.cmake b/vcpkg-ports/sdl1/portfile.cmake
@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/vcpkg-ports/sdl1/vcpkg.json b/vcpkg-ports/sdl1/vcpkg.json
@@ -0,0 +1,4 @@
+{
+	"name": "sdl1",
+	"version": "1.2.5"
+}