From b8963c759d08200bf5ae23fc9e6faba0edd07bdd Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Sun, 7 May 2023 21:21:35 +1200
Subject: [PATCH 01/26] chore(ci): update cache and install-nix

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6791cc3ff..cede732d2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
           path: openspades
 
       - name: Cache vcpkg and dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3.3.1
         with:
           path: |
             vcpkg/installed
@@ -47,7 +47,7 @@ jobs:
           path: openspades
 
       - name: Cache vcpkg and dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3.3.1
         with:
           path: |
             vcpkg/installed
@@ -76,7 +76,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install Nix
-        uses: cachix/install-nix-action@v17
+        uses: cachix/install-nix-action@v18
 
       - name: Build Nix flake
         run: nix build

From bbf49f86236613dd8f087a65c98c072df62aa9df Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Sun, 7 May 2023 22:07:22 +1200
Subject: [PATCH 02/26] chore(ci): invoke cmake directly

---
 .github/workflows/ci.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cede732d2..894fef22b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,12 +29,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86-windows.txt
 
       - name: Build application
-        uses: ashutoshvarma/action-cmake-build@master
-        with:
-          build-dir: ${{ runner.workspace }}/openspades.mk
-          build-type: RelWithDebInfo
-          configure-options: -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static
-          parallel: 8
+        run: mkdir ${{ runner.workspace }}/openspades.mk; cd mkdir ${{ runner.workspace }}/openspades.mk; cmake .. -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static -j 8
 
   build-macos:
     name: Build (macOS)
@@ -61,12 +56,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86_64-darwin.txt
 
       - name: Build application
-        uses: ashutoshvarma/action-cmake-build@master
-        with:
-          build-dir: ${{ runner.workspace }}/openspades.mk
-          build-type: RelWithDebInfo
-          configure-options: -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64
-          parallel: 8
+        run: mkdir ${{ runner.workspace }}/openspades.mk; cd mkdir ${{ runner.workspace }}/openspades.mk; cmake .. -CMAKE_BUILD_TYPE RelWithDebInfo -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64 -j 8
   
   build-nix:
     name: Build (Linux + Nix)

From bbafa6e2d7cd56c5c2d32942d8f4d79abe47e16b Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Sun, 7 May 2023 22:30:25 +1200
Subject: [PATCH 03/26] chore(ci): fix mkdir failing

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 894fef22b..c373791d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86-windows.txt
 
       - name: Build application
-        run: mkdir ${{ runner.workspace }}/openspades.mk; cd mkdir ${{ runner.workspace }}/openspades.mk; cmake .. -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static -j 8
+        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd mkdir "${{ runner.workspace }}/openspades.mk"; cmake .. -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static -j 8
 
   build-macos:
     name: Build (macOS)
@@ -56,7 +56,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86_64-darwin.txt
 
       - name: Build application
-        run: mkdir ${{ runner.workspace }}/openspades.mk; cd mkdir ${{ runner.workspace }}/openspades.mk; cmake .. -CMAKE_BUILD_TYPE RelWithDebInfo -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64 -j 8
+        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd mkdir "${{ runner.workspace }}/openspades.mk"; cmake .. -CMAKE_BUILD_TYPE RelWithDebInfo -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64 -j 8
   
   build-nix:
     name: Build (Linux + Nix)

From 2b5a8d9354c91a683d30791f70ee76e25d8c207b Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Sun, 7 May 2023 22:34:39 +1200
Subject: [PATCH 04/26] chore(ci): fix duplicate mkdir

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c373791d4..9764f8653 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86-windows.txt
 
       - name: Build application
-        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd mkdir "${{ runner.workspace }}/openspades.mk"; cmake .. -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static -j 8
+        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static -j 8
 
   build-macos:
     name: Build (macOS)
@@ -56,7 +56,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86_64-darwin.txt
 
       - name: Build application
-        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd mkdir "${{ runner.workspace }}/openspades.mk"; cmake .. -CMAKE_BUILD_TYPE RelWithDebInfo -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64 -j 8
+        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. -CMAKE_BUILD_TYPE RelWithDebInfo -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64 -j 8
   
   build-nix:
     name: Build (Linux + Nix)

From a3408e5da5fe9f130916311726351861e5882f7f Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Sun, 7 May 2023 22:38:41 +1200
Subject: [PATCH 05/26] chore(ci): change -j to --parallel

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9764f8653..6aacfbb32 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86-windows.txt
 
       - name: Build application
-        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static -j 8
+        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. --parallel 8 -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static
 
   build-macos:
     name: Build (macOS)
@@ -56,7 +56,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86_64-darwin.txt
 
       - name: Build application
-        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. -CMAKE_BUILD_TYPE RelWithDebInfo -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64 -j 8
+        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. --parallel 8 -CMAKE_BUILD_TYPE RelWithDebInfo -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64
   
   build-nix:
     name: Build (Linux + Nix)

From f075645cfd28da993c2861891e915e637265b50d Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Sun, 7 May 2023 22:46:47 +1200
Subject: [PATCH 06/26] Update ci.yml

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6aacfbb32..322738956 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86-windows.txt
 
       - name: Build application
-        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. --parallel 8 -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static
+        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -j8 -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static
 
   build-macos:
     name: Build (macOS)
@@ -56,7 +56,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86_64-darwin.txt
 
       - name: Build application
-        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. --parallel 8 -CMAKE_BUILD_TYPE RelWithDebInfo -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64
+        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. -CMAKE_BUILD_TYPE RelWithDebInfo -j8 -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64
   
   build-nix:
     name: Build (Linux + Nix)

From 3b4ae984e217e6246f554b4a9fb189a5206f28e4 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Sun, 7 May 2023 22:50:41 +1200
Subject: [PATCH 07/26] testing with default jobs

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 322738956..b5b10b799 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86-windows.txt
 
       - name: Build application
-        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -j8 -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static
+        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static
 
   build-macos:
     name: Build (macOS)
@@ -56,7 +56,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86_64-darwin.txt
 
       - name: Build application
-        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. -CMAKE_BUILD_TYPE RelWithDebInfo -j8 -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64
+        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. -CMAKE_BUILD_TYPE RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64
   
   build-nix:
     name: Build (Linux + Nix)

From 9393a29af78e70668382e8c494c22ab342f94017 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Sun, 14 May 2023 20:31:23 +1200
Subject: [PATCH 08/26] Source directory in workspace/openspades

Co-authored-by: yvt <i@yvt.jp>
---
 .github/workflows/ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b5b10b799..394babaf6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,13 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86-windows.txt
 
       - name: Build application
-        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. -A Win32 -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static
+        run: |
+          mkdir "${{ runner.workspace }}/openspades/openspades.mk"
+          cd "${{ runner.workspace }}/openspades/openspades.mk"
+          cmake .. -A Win32 \
+            -D CMAKE_BUILD_TYPE=RelWithDebInfo \
+            -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake \
+            -D VCPKG_TARGET_TRIPLET=x86-windows-static
 
   build-macos:
     name: Build (macOS)

From 5e0013ab3c5d75872ddd3029834612e3de975196 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Mon, 15 May 2023 18:46:37 +1200
Subject: [PATCH 09/26] Use bash

Co-authored-by: yvt <i@yvt.jp>
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 394babaf6..f3d0ca31c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,6 +29,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86-windows.txt
 
       - name: Build application
+        shell: bash
         run: |
           mkdir "${{ runner.workspace }}/openspades/openspades.mk"
           cd "${{ runner.workspace }}/openspades/openspades.mk"

From 8e4e15107f65e9d3e4ed9bef25d124c6a38bcf2a Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Mon, 15 May 2023 18:55:02 +1200
Subject: [PATCH 10/26] Fix macOS path

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f3d0ca31c..17e31381a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86_64-darwin.txt
 
       - name: Build application
-        run: mkdir "${{ runner.workspace }}/openspades.mk"; cd "${{ runner.workspace }}/openspades.mk"; cmake .. -CMAKE_BUILD_TYPE RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64
+        run: mkdir "${{ runner.workspace }}/openspades/openspades.mk"; cd "${{ runner.workspace }}/openspades/openspades.mk"; cmake .. -CMAKE_BUILD_TYPE RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64
   
   build-nix:
     name: Build (Linux + Nix)

From 187946e56e708bb6f54d498c34ecc6a5f85af7d5 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Tue, 16 May 2023 19:07:22 +1200
Subject: [PATCH 11/26] Update ci.yml

---
 .github/workflows/ci.yml | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 17e31381a..19fad7d10 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,15 +28,23 @@ jobs:
       - name: Build dependencies
         run: vcpkg/vcpkg install @vcpkg_x86-windows.txt
 
-      - name: Build application
+      - name: Configure application
         shell: bash
         run: |
           mkdir "${{ runner.workspace }}/openspades/openspades.mk"
           cd "${{ runner.workspace }}/openspades/openspades.mk"
-          cmake .. -A Win32 \
-            -D CMAKE_BUILD_TYPE=RelWithDebInfo \
-            -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake \
-            -D VCPKG_TARGET_TRIPLET=x86-windows-static
+          cmake -A Win32 `
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+            -DCMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
+            -D VCPKG_TARGET_TRIPLET=x86-windows-static `
+            -S ${{ runner.workspace }}/openspades
+            -B ${{ runner.workspace }}/openspades/openspades.mk
+            
+      - name: Build application
+        shell: bash
+        run: |
+          cmake --build ${{ runner.workspace }}/openspades --config RelWithDebInfo --parallel 2
+            
 
   build-macos:
     name: Build (macOS)
@@ -61,9 +69,26 @@ jobs:
 
       - name: Build dependencies
         run: vcpkg/vcpkg install @vcpkg_x86_64-darwin.txt
-
+      - name: Configure application
+        run: |
+          mkdir "${{ runner.workspace }}/openspades/openspades.mk"
+          cd "${{ runner.workspace }}/openspades/openspades.mk"
+          cmake -A Win32 `
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+            -DCMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
+            -D VCPKG_TARGET_TRIPLET=x86-windows-static `
+            -S ${{ runner.workspace }}/openspades
+            -B ${{ runner.workspace }}/openspades/openspades.mk
+            
       - name: Build application
-        run: mkdir "${{ runner.workspace }}/openspades/openspades.mk"; cd "${{ runner.workspace }}/openspades/openspades.mk"; cmake .. -CMAKE_BUILD_TYPE RelWithDebInfo -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-osx -D CMAKE_OSX_ARCHITECTURES=x86_64
+        run: |
+          mkdir "${{ runner.workspace }}/openspades/openspades.mk" `
+          cd "${{ runner.workspace }}/openspades/openspades.mk" `
+          cmake .. `
+            -CMAKE_BUILD_TYPE RelWithDebInfo `
+            -DCMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
+            -D VCPKG_TARGET_TRIPLET=x64-osx `
+            -D CMAKE_OSX_ARCHITECTURES=x86_64
   
   build-nix:
     name: Build (Linux + Nix)

From 0e4e44c6f53164fc200f25c4fbc148a18ba05117 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Tue, 16 May 2023 19:27:19 +1200
Subject: [PATCH 12/26] Update ci.yml

---
 .github/workflows/ci.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19fad7d10..f22689a5d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
           cd "${{ runner.workspace }}/openspades/openspades.mk"
           cmake -A Win32 `
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-            -DCMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
+            --toolchain ${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
             -D VCPKG_TARGET_TRIPLET=x86-windows-static `
             -S ${{ runner.workspace }}/openspades
             -B ${{ runner.workspace }}/openspades/openspades.mk
@@ -69,26 +69,22 @@ jobs:
 
       - name: Build dependencies
         run: vcpkg/vcpkg install @vcpkg_x86_64-darwin.txt
+        
       - name: Configure application
         run: |
           mkdir "${{ runner.workspace }}/openspades/openspades.mk"
           cd "${{ runner.workspace }}/openspades/openspades.mk"
-          cmake -A Win32 `
+          cmake -G Ninja `
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-            -DCMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
-            -D VCPKG_TARGET_TRIPLET=x86-windows-static `
+            --toolchain =${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
+            -D VCPKG_TARGET_TRIPLET=x64-osx `
             -S ${{ runner.workspace }}/openspades
             -B ${{ runner.workspace }}/openspades/openspades.mk
             
       - name: Build application
         run: |
-          mkdir "${{ runner.workspace }}/openspades/openspades.mk" `
           cd "${{ runner.workspace }}/openspades/openspades.mk" `
-          cmake .. `
-            -CMAKE_BUILD_TYPE RelWithDebInfo `
-            -DCMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
-            -D VCPKG_TARGET_TRIPLET=x64-osx `
-            -D CMAKE_OSX_ARCHITECTURES=x86_64
+          ninja
   
   build-nix:
     name: Build (Linux + Nix)

From 6244d79cb6f51dae2fde8c0cb327cdb366375801 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Tue, 16 May 2023 19:29:45 +1200
Subject: [PATCH 13/26] Update ci.yml

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f22689a5d..363778d0c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
         run: |
           mkdir "${{ runner.workspace }}/openspades/openspades.mk"
           cd "${{ runner.workspace }}/openspades/openspades.mk"
-          cmake -A Win32 `
+          cmake .. -A Win32 `
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
             --toolchain ${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
             -D VCPKG_TARGET_TRIPLET=x86-windows-static `
@@ -74,7 +74,7 @@ jobs:
         run: |
           mkdir "${{ runner.workspace }}/openspades/openspades.mk"
           cd "${{ runner.workspace }}/openspades/openspades.mk"
-          cmake -G Ninja `
+          cmake .. -G Ninja `
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
             --toolchain =${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
             -D VCPKG_TARGET_TRIPLET=x64-osx `

From c6a1ad93e40ebf305f7b08f040b46f48a037b29a Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Thu, 18 May 2023 22:37:37 +1200
Subject: [PATCH 14/26] Update ci.yml

---
 .github/workflows/ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 363778d0c..2fc7c0b8f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,6 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86-windows.txt
 
       - name: Configure application
-        shell: bash
         run: |
           mkdir "${{ runner.workspace }}/openspades/openspades.mk"
           cd "${{ runner.workspace }}/openspades/openspades.mk"
@@ -41,7 +40,6 @@ jobs:
             -B ${{ runner.workspace }}/openspades/openspades.mk
             
       - name: Build application
-        shell: bash
         run: |
           cmake --build ${{ runner.workspace }}/openspades --config RelWithDebInfo --parallel 2
             

From 673df3ebf560fdb2d9c9c8368b8c75612a89e5d6 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Thu, 18 May 2023 22:43:10 +1200
Subject: [PATCH 15/26] Update ci.yml

---
 .github/workflows/ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2fc7c0b8f..7ed7ada88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,13 +35,11 @@ jobs:
           cmake .. -A Win32 `
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
             --toolchain ${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
-            -D VCPKG_TARGET_TRIPLET=x86-windows-static `
-            -S ${{ runner.workspace }}/openspades
-            -B ${{ runner.workspace }}/openspades/openspades.mk
+            -D VCPKG_TARGET_TRIPLET=x86-windows-static
             
       - name: Build application
         run: |
-          cmake --build ${{ runner.workspace }}/openspades --config RelWithDebInfo --parallel 2
+          cmake --build ${{ runner.workspace }}/openspades/openspades.mk --config RelWithDebInfo --parallel 2
             
 
   build-macos:

From 341df3dfaa4f667c66a12ea2067cd82951ca5b54 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Thu, 18 May 2023 22:52:15 +1200
Subject: [PATCH 16/26] Update ci.yml

---
 .github/workflows/ci.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ed7ada88..ff40c749f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,7 +39,9 @@ jobs:
             
       - name: Build application
         run: |
-          cmake --build ${{ runner.workspace }}/openspades/openspades.mk --config RelWithDebInfo --parallel 2
+          cmake --build ${{ runner.workspace }}/openspades/openspades.mk `
+            --config RelWithDebInfo `
+            --parallel 2
             
 
   build-macos:
@@ -58,6 +60,7 @@ jobs:
           path: |
             vcpkg/installed
             !.git
+            ${GITHUB_WORKSPACE}/ninja-build
           key: ${{ runner.os }}-${{ hashFiles('vcpkg_x86_64-darwin.txt', '.gitmodules') }}
 
       - name: Bootstrap vcpkg
@@ -65,6 +68,9 @@ jobs:
 
       - name: Build dependencies
         run: vcpkg/vcpkg install @vcpkg_x86_64-darwin.txt
+      
+      - name: Install ninja
+        uses: seanmiddleditch/install-ninja-build-tool@v3
         
       - name: Configure application
         run: |
@@ -74,8 +80,6 @@ jobs:
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
             --toolchain =${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
             -D VCPKG_TARGET_TRIPLET=x64-osx `
-            -S ${{ runner.workspace }}/openspades
-            -B ${{ runner.workspace }}/openspades/openspades.mk
             
       - name: Build application
         run: |

From 0e097dc9f96bd37db1ff5675439320c30667fce1 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Thu, 18 May 2023 22:53:55 +1200
Subject: [PATCH 17/26] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ff40c749f..f095ef28e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -70,7 +70,7 @@ jobs:
         run: vcpkg/vcpkg install @vcpkg_x86_64-darwin.txt
       
       - name: Install ninja
-        uses: seanmiddleditch/install-ninja-build-tool@v3
+        uses: seanmiddleditch/gha-setup-ninja@v3
         
       - name: Configure application
         run: |

From 5bd3495eb9223d198d8ca7b55e289225318615c2 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Mon, 22 May 2023 20:47:54 +1200
Subject: [PATCH 18/26] random = :(

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f095ef28e..637fb733f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,7 +78,7 @@ jobs:
           cd "${{ runner.workspace }}/openspades/openspades.mk"
           cmake .. -G Ninja `
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-            --toolchain =${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
+            --toolchain ${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
             -D VCPKG_TARGET_TRIPLET=x64-osx `
             
       - name: Build application

From 0ed9cfb5318ed385a0fefe2745ea3f6a8475d28d Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Mon, 22 May 2023 20:58:10 +1200
Subject: [PATCH 19/26] Update ci.yml

---
 .github/workflows/ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 637fb733f..b01d969e2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,14 +76,15 @@ jobs:
         run: |
           mkdir "${{ runner.workspace }}/openspades/openspades.mk"
           cd "${{ runner.workspace }}/openspades/openspades.mk"
-          cmake .. -G Ninja `
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-            --toolchain ${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake `
-            -D VCPKG_TARGET_TRIPLET=x64-osx `
+          cmake -G Ninja .. \
+            -D CMAKE_BUILD_TYPE=RelWithDebInfo \
+            -D CMAKE_OSX_ARCHITECTURES=x86_64 \
+            --toolchain ${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake \
+            -D VCPKG_TARGET_TRIPLET=x64-osx \
             
       - name: Build application
         run: |
-          cd "${{ runner.workspace }}/openspades/openspades.mk" `
+          cd "${{ runner.workspace }}/openspades/openspades.mk" \
           ninja
   
   build-nix:

From dbeddf6c83fed2d6a625b5b2867becb2dd9f1065 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Sun, 18 Jun 2023 18:44:39 +1200
Subject: [PATCH 20/26] Try to fix macOS

---
 .github/workflows/ci.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b01d969e2..4830ac475 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,24 +63,25 @@ jobs:
             ${GITHUB_WORKSPACE}/ninja-build
           key: ${{ runner.os }}-${{ hashFiles('vcpkg_x86_64-darwin.txt', '.gitmodules') }}
 
+      - name: Install ninja
+        uses: seanmiddleditch/gha-setup-ninja@v3
+        
       - name: Bootstrap vcpkg
         run: vcpkg/bootstrap-vcpkg.sh
 
       - name: Build dependencies
-        run: vcpkg/vcpkg install @vcpkg_x86_64-darwin.txt
-      
-      - name: Install ninja
-        uses: seanmiddleditch/gha-setup-ninja@v3
+        run: vcpkg/vcpkg install "@vcpkg_x86_64-darwin.txt"
         
       - name: Configure application
         run: |
           mkdir "${{ runner.workspace }}/openspades/openspades.mk"
-          cd "${{ runner.workspace }}/openspades/openspades.mk"
-          cmake -G Ninja .. \
+          cmake -G Ninja \
             -D CMAKE_BUILD_TYPE=RelWithDebInfo \
             -D CMAKE_OSX_ARCHITECTURES=x86_64 \
-            --toolchain ${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake \
+            -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake \
             -D VCPKG_TARGET_TRIPLET=x64-osx \
+            -S ..
+            -B ${{ runner.workspace }}/openspades/openspades.mk
             
       - name: Build application
         run: |

From 187ff1677152cf408c18102564b34cbf0f7e8172 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Tue, 20 Jun 2023 04:30:41 +0000
Subject: [PATCH 21/26] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4830ac475..81ef75988 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,7 +80,7 @@ jobs:
             -D CMAKE_OSX_ARCHITECTURES=x86_64 \
             -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake \
             -D VCPKG_TARGET_TRIPLET=x64-osx \
-            -S ..
+            -S openspades.mk \
             -B ${{ runner.workspace }}/openspades/openspades.mk
             
       - name: Build application

From 355a7140e13f9020d6f1bab74628f14acff366f1 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Sun, 25 Jun 2023 18:41:28 +1200
Subject: [PATCH 22/26] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 81ef75988..5f1aeb2d1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,7 +80,7 @@ jobs:
             -D CMAKE_OSX_ARCHITECTURES=x86_64 \
             -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake \
             -D VCPKG_TARGET_TRIPLET=x64-osx \
-            -S openspades.mk \
+            -S .. \
             -B ${{ runner.workspace }}/openspades/openspades.mk
             
       - name: Build application

From d215d011739c8049bf4b0b9366c79aa0f6867024 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Sun, 25 Jun 2023 18:58:30 +1200
Subject: [PATCH 23/26] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5f1aeb2d1..7f56c29fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,7 +80,7 @@ jobs:
             -D CMAKE_OSX_ARCHITECTURES=x86_64 \
             -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake \
             -D VCPKG_TARGET_TRIPLET=x64-osx \
-            -S .. \
+            -S openspades \
             -B ${{ runner.workspace }}/openspades/openspades.mk
             
       - name: Build application

From f890ba1bd6fdb915f7719cd5f7c34f7d8a110748 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Thu, 20 Jul 2023 06:15:34 +0000
Subject: [PATCH 24/26] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7f56c29fe..fd76436ca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,7 +80,7 @@ jobs:
             -D CMAKE_OSX_ARCHITECTURES=x86_64 \
             -D CMAKE_TOOLCHAIN_FILE=${{ runner.workspace }}/openspades/vcpkg/scripts/buildsystems/vcpkg.cmake \
             -D VCPKG_TARGET_TRIPLET=x64-osx \
-            -S openspades \
+            -S ${{ runner.workspace }}/openspades \
             -B ${{ runner.workspace }}/openspades/openspades.mk
             
       - name: Build application

From 57244913040bc323765fc638ec0ab38a59a6ef9d Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Thu, 20 Jul 2023 06:26:11 +0000
Subject: [PATCH 25/26] Update ci.yml

---
 .github/workflows/ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd76436ca..795a16964 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,8 +85,7 @@ jobs:
             
       - name: Build application
         run: |
-          cd "${{ runner.workspace }}/openspades/openspades.mk" \
-          ninja
+          ninja --verbose -C "${{ runner.workspace }}/openspades/openspades.mk"
   
   build-nix:
     name: Build (Linux + Nix)

From 2fe27e7fe25192701746207444e080208cbf27ee Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Thu, 20 Jul 2023 06:47:27 +0000
Subject: [PATCH 26/26] Get Ninja from pip3/pypi.org

---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 795a16964..8d01577d8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,7 +64,9 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('vcpkg_x86_64-darwin.txt', '.gitmodules') }}
 
       - name: Install ninja
-        uses: seanmiddleditch/gha-setup-ninja@v3
+        run: |
+          pip3 install wheel setuptools
+          pip3 install ninja --upgrade
         
       - name: Bootstrap vcpkg
         run: vcpkg/bootstrap-vcpkg.sh