more CI tweaks, make sure to build carla statically

Signed-off-by: falkTX <falktx@falktx.com>
falkTX · Nov 19, 2023 · 1e279cf · 1e279cf
1 parent ea4aba6
commit 1e279cf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,10 +1,10 @@
 name: build
 
-on:
-  push:
+on: [push, pull_request]
 
 env:
   CACHE_VERSION: 1
+  DEBIAN_FRONTEND: noninteractive
   PAWPAW_SKIP_LTO: 1
   PAWPAW_SKIP_SAMPLERATE: 1
   PAWPAW_VERSION: 7105dc52abffd5aa5f1ab65f27396f59ba945ea3
@@ -42,7 +42,7 @@ jobs:
         run: |
           source PawPaw/local.env ${{ matrix.target }}
           cmake -S . -B build
-          $(which cmake) --build build
+          $(which cmake) --build build -j
 
   macos:
     strategy:
@@ -73,15 +73,15 @@ jobs:
         run: |
           source PawPaw/local.env ${{ matrix.target }}
           cmake -S . -B build
-          $(which cmake) --build build
+          $(which cmake) --build build -j
 
   windows:
     strategy:
       matrix:
         target: [win32, win64]
     runs-on: ubuntu-latest
     container:
-      image: debian:12
+      image: ubuntu:23.10
     steps:
       - uses: actions/checkout@v3
         with:
@@ -97,10 +97,11 @@ jobs:
           sudo dpkg --add-architecture i386
           sudo apt-get update -qq
           if [ '${{ matrix.target }}' == 'win32' ]; then
-            sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable
+            sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 
           else
-            sudo apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
+            sudo apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
           fi
+          sudo apt-get install -yqq autoconf automake curl cmake git mingw-w64 wine-stable
       - name: bootstrap
         shell: bash
         run: |
@@ -112,4 +113,4 @@ jobs:
         run: |
           source PawPaw/local.env ${{ matrix.target }}
           cmake -S . -B build
-          $(which cmake) --build build
+          $(which cmake) --build build -j
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,6 +23,8 @@ pkg_check_modules(SNDFILE IMPORTED_TARGET REQUIRED sndfile)
 #######################################################################################################################
 # Import carla stuff
 
+set(CARLA_BUILD_STATIC TRUE)
+
 add_subdirectory(src/carla/cmake)
 
 #######################################################################################################################