Merge remote-tracking branch 'origin/spats-integration' into spats_ce…

…ntral_logic to resole github CI Windows build failure
firoorg · Feb 20, 2025 · 7e854c3 · 7e854c3
2 parents 59b03ce + bbc12ca
commit 7e854c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
@@ -123,7 +123,7 @@ jobs:
   build-windows:
     name: Build for Windows
     needs: create-source-distribution
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       ARTIFACT_DIR: windows-binaries
     steps:
@@ -209,4 +209,4 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: mac-binaries
-        path: ${{ env.ARTIFACT_DIR }}
+        path: ${{ env.ARTIFACT_DIR }}
diff --git a/doc/build-osx.md b/doc/build-osx.md
@@ -16,7 +16,7 @@ Then install [Homebrew](https://brew.sh).
 Dependencies
 ----------------------
 
-    brew install automake berkeley-db4 libtool boost --c++11 miniupnpc openssl protobuf qt libevent
+    brew install automake berkeley-db4 libtool boost --c++20 miniupnpc openssl protobuf qt libevent
 
 If you want to build the disk image with `make deploy` (.dmg / optional), you need RSVG