Skip to content

Commit 1e279cf

Browse files
committed
more CI tweaks, make sure to build carla statically
Signed-off-by: falkTX <falktx@falktx.com>
1 parent ea4aba6 commit 1e279cf

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: build
22

3-
on:
4-
push:
3+
on: [push, pull_request]
54

65
env:
76
CACHE_VERSION: 1
7+
DEBIAN_FRONTEND: noninteractive
88
PAWPAW_SKIP_LTO: 1
99
PAWPAW_SKIP_SAMPLERATE: 1
1010
PAWPAW_VERSION: 7105dc52abffd5aa5f1ab65f27396f59ba945ea3
@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
source PawPaw/local.env ${{ matrix.target }}
4444
cmake -S . -B build
45-
$(which cmake) --build build
45+
$(which cmake) --build build -j
4646
4747
macos:
4848
strategy:
@@ -73,15 +73,15 @@ jobs:
7373
run: |
7474
source PawPaw/local.env ${{ matrix.target }}
7575
cmake -S . -B build
76-
$(which cmake) --build build
76+
$(which cmake) --build build -j
7777
7878
windows:
7979
strategy:
8080
matrix:
8181
target: [win32, win64]
8282
runs-on: ubuntu-latest
8383
container:
84-
image: debian:12
84+
image: ubuntu:23.10
8585
steps:
8686
- uses: actions/checkout@v3
8787
with:
@@ -97,10 +97,11 @@ jobs:
9797
sudo dpkg --add-architecture i386
9898
sudo apt-get update -qq
9999
if [ '${{ matrix.target }}' == 'win32' ]; then
100-
sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable
100+
sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686
101101
else
102-
sudo apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
102+
sudo apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
103103
fi
104+
sudo apt-get install -yqq autoconf automake curl cmake git mingw-w64 wine-stable
104105
- name: bootstrap
105106
shell: bash
106107
run: |
@@ -112,4 +113,4 @@ jobs:
112113
run: |
113114
source PawPaw/local.env ${{ matrix.target }}
114115
cmake -S . -B build
115-
$(which cmake) --build build
116+
$(which cmake) --build build -j

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ pkg_check_modules(SNDFILE IMPORTED_TARGET REQUIRED sndfile)
2323
#######################################################################################################################
2424
# Import carla stuff
2525

26+
set(CARLA_BUILD_STATIC TRUE)
27+
2628
add_subdirectory(src/carla/cmake)
2729

2830
#######################################################################################################################

0 commit comments

Comments
 (0)