Further testing

Author: NicksWorld

.github/workflows/build-windows.yml

@@ -118,17 +118,19 @@ jobs:
             # win-msvc-${{ inputs.cache-id }}
             # win-msvc
       - name: Configure DFHack
+        uses: ilammy/msvc-dev-cmd@v1
         env:
           CMAKE_EXTRA_ARGS: -DBUILD_PDBS:BOOL=${{ inputs.cache-id == 'release' }} -DDFHACK_RUN_URL='https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}' -DBUILD_LIBRARY=${{ inputs.platform-files }} -DBUILD_PLUGINS:BOOL=${{ inputs.platform-files && inputs.plugins }} -DBUILD_STONESENSE:BOOL=${{ inputs.stonesense }} -DBUILD_DOCS:BOOL=${{ inputs.docs }} -DBUILD_DOCS_NO_HTML:BOOL=${{ !inputs.html }} -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} -DBUILD_DFLAUNCH:BOOL=${{ inputs.launchdf }} -DBUILD_TESTS:BOOL=${{ inputs.tests }} -DBUILD_XMLDUMP:BOOL=${{ inputs.xml-dump-type-sizes }} ${{ inputs.xml-dump-type-sizes && '-DINSTALL_XMLDUMP:BOOL=1' || '' }}
           CC: cl
           CXX: cl
         run: |
           cmake -S . `
             -B build `
-            -DCMAKE_BUILD_ARCH=64 `
-            -DCMAKE_BUILD_TYPE=Release `
-            ${CMAKE_EXTRA_ARGS}
+            -GNinja `
+            -DDFHACK_BUILD_ARCH=64 `
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo
       - name: Build DFHack
+        uses: ilammy/msvc-dev-cmd@v1
         run: |
           cmake --build build
       # - name: Finalize cache

.github/workflows/test.yml

@@ -36,33 +36,33 @@ jobs:
       html: false
       tests: true
 
-  build-linux:
-    name: Linux gcc-${{ matrix.gcc }}
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      dfhack_repo: ${{ inputs.dfhack_repo }}
-      dfhack_ref: ${{ inputs.dfhack_ref }}
-      scripts_repo: ${{ inputs.scripts_repo }}
-      scripts_ref: ${{ inputs.scripts_ref }}
-      structures_repo: ${{ inputs.structures_repo }}
-      structures_ref: ${{ inputs.structures_ref }}
-      artifact-name: test-gcc-${{ matrix.gcc }}
-      cache-id: test
-      stonesense: ${{ matrix.plugins == 'all' }}
-      extras: ${{ matrix.plugins == 'all' }}
-      docs: true
-      html: false
-      tests: true
-      gcc-ver: ${{ matrix.gcc }}
-    secrets: inherit
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - gcc: 11 # baseline compatibility with ubuntu LTS 22.04
-          plugins: "default"
-        - gcc: 12 # highest available in ubuntu 22.04
-          plugins: "all"
+  # build-linux:
+  #   name: Linux gcc-${{ matrix.gcc }}
+  #   uses: ./.github/workflows/build-linux.yml
+  #   with:
+  #     dfhack_repo: ${{ inputs.dfhack_repo }}
+  #     dfhack_ref: ${{ inputs.dfhack_ref }}
+  #     scripts_repo: ${{ inputs.scripts_repo }}
+  #     scripts_ref: ${{ inputs.scripts_ref }}
+  #     structures_repo: ${{ inputs.structures_repo }}
+  #     structures_ref: ${{ inputs.structures_ref }}
+  #     artifact-name: test-gcc-${{ matrix.gcc }}
+  #     cache-id: test
+  #     stonesense: ${{ matrix.plugins == 'all' }}
+  #     extras: ${{ matrix.plugins == 'all' }}
+  #     docs: true
+  #     html: false
+  #     tests: true
+  #     gcc-ver: ${{ matrix.gcc }}
+  #   secrets: inherit
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       include:
+  #       - gcc: 11 # baseline compatibility with ubuntu LTS 22.04
+  #         plugins: "default"
+  #       - gcc: 12 # highest available in ubuntu 22.04
+  #         plugins: "all"
 
   test-windows:
     name: Run Windows test suite
@@ -88,26 +88,26 @@ jobs:
       plugins: default
       config: empty
 
-  test-linux:
-    name: Run Linux test suite
-    needs: build-linux
-    uses: ./.github/workflows/test-suite.yml
-    with:
-      dfhack_repo: ${{ inputs.dfhack_repo }}
-      dfhack_ref: ${{ inputs.dfhack_ref }}
-      os: ubuntu
-      compiler: gcc-11
-      plugins: default
-      config: default
-
-  test-linux-gcc-12-all-plugins:
-    name: Run Linux test suite (gcc-12, all plugins)
-    needs: build-linux
-    uses: ./.github/workflows/test-suite.yml
-    with:
-      dfhack_repo: ${{ inputs.dfhack_repo }}
-      dfhack_ref: ${{ inputs.dfhack_ref }}
-      os: ubuntu
-      compiler: gcc-12
-      plugins: all
-      config: default
+  # test-linux:
+  #   name: Run Linux test suite
+  #   needs: build-linux
+  #   uses: ./.github/workflows/test-suite.yml
+  #   with:
+  #     dfhack_repo: ${{ inputs.dfhack_repo }}
+  #     dfhack_ref: ${{ inputs.dfhack_ref }}
+  #     os: ubuntu
+  #     compiler: gcc-11
+  #     plugins: default
+  #     config: default
+  #
+  # test-linux-gcc-12-all-plugins:
+  #   name: Run Linux test suite (gcc-12, all plugins)
+  #   needs: build-linux
+  #   uses: ./.github/workflows/test-suite.yml
+  #   with:
+  #     dfhack_repo: ${{ inputs.dfhack_repo }}
+  #     dfhack_ref: ${{ inputs.dfhack_ref }}
+  #     os: ubuntu
+  #     compiler: gcc-12
+  #     plugins: all
+  #     config: default