Pulling out windows msvc from matrix

enetheru · Mar 12, 2024 · 8c27ff8 · 8c27ff8
1 parent 714f23b
commit 8c27ff8
Showing 1 changed file with 50 additions and 10 deletions.
diff --git a/.github/workflows/ci-cmake.yml b/.github/workflows/ci-cmake.yml
@@ -10,7 +10,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-windows-cmake-mingw:
+  # Windows-MinGW64-Windows
+  # =======================
+  build-windows-mingw-windows:
     name: 🏁 Windows.MinGW64.windows
     runs-on: windows-2019
 
@@ -24,7 +26,7 @@ jobs:
         with:
           submodules: recursive
 
-# Install OS Level deps
+      # Install OS Level deps
       - name: Install MSYS2 and Dependencies
         uses: msys2/setup-msys2@v2
         with:
@@ -33,8 +35,10 @@ jobs:
             cmake:p
             ninja:p
             
-# Cmake configure and build godot-cpp
+      # Cmake configure and build godot-cpp
       - name: Configure godot-cpp
+        # FIXME this stage uses in-source build, because the test extension
+        # relies on it. In the future change this to allow out of source build.
         run: >-
           cmake
           -DCMAKE_BUILD_TYPE=Release
@@ -44,7 +48,7 @@ jobs:
           cmake -LH -B .
           cmake --build . -j $(nproc)
         
-# Configure and build test extension          
+      # Configure and build test extension          
       - name: Configure godot-cpp/test
         run: >-
           cmake -B build-test -S test
@@ -57,7 +61,7 @@ jobs:
           cmake -B build-test -LH
           cmake --build build-test -j $(nproc)
 
-# Perform testing
+      # Perform testing
       - name: Download latest Godot artifacts
         uses: dsnopek/action-download-artifact@1322f74e2dac9feed2ee76a32d9ae1ca3b4cf4e9
         with:
@@ -88,6 +92,42 @@ jobs:
           #path: ${{ matrix.builder.artifact-dir}}${{ matrix.platforms.artifact-path }}
           #if-no-files-found: error
 
+  # Windows-MSVC-Windows
+  # ====================
+  build-windows-msvc-windows:
+    runs-on: windows-2019
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      # Configure and build godot-cpp
+      - name: Configure godot-cpp
+        run: >-
+          cmake -DCMAKE_BUILD_TYPE=Release
+          -G"Visual Studio 16 2019" .
+
+      - name: Build godot-cpp
+        run: |
+          cmake -LH --build .
+          cmake -j $(nproc) --build .
+        
+      # Configure and build godot-cpp/tesst          
+      - name: Configure godot-cpp/test
+        run: >-
+          cmake -S test -B build-test 
+          -DCMAKE_BUILD_TYPE=Release
+          -DGODOT_HEADERS_PATH="./godot-headers"
+          -DCPP_BINDINGS_PATH="."
+          -G"Visual Studio 16 2019"
+
+      - name: Build godot-cpp/test
+        run: |
+          cmake -LH -B build-test
+          cmake -j $(nproc) --build build-test
+
+  # Linux-gcc-Linux          
   build:
     name: ${{ matrix.icon }} ${{ matrix.platform }}(${{matrix.arch}}, ${{ matrix.compiler }} ${{ matrix.extra_label }})
     runs-on: ${{ matrix.runner }}
@@ -123,11 +163,11 @@ jobs:
               #extra_config: >-
               #-DCMAKE_TOOLCHAIN_FILE:PATH=$ANDROID_NDK/build/cmake/android.toolchain.cmake
               #-DANDROID_TOOLCHAIN_NAME:STRING=arm-linux-androidabi-4.9
-          - runner: windows-2019
-            icon: 🏁
-            platform: windows
-            arch: x86_64
-            compiler: msvc
+              #- runner: windows-2019
+              #icon: 🏁
+              #platform: windows
+              #arch: x86_64
+              #compiler: msvc
 
     env:
       SCONS_CACHE: ${{ github.workspace }}/.scons-cache/