diff options
| author | Thomas Huth <huth@tuxfamily.org> | 2022-01-29 07:37:22 (GMT) |
|---|---|---|
| committer | Thomas Huth <huth@tuxfamily.org> | 2022-01-29 07:38:15 (GMT) |
| commit | 08bc35c605c825ce2a4f92407c3cb0a7022be95a (patch) | |
| tree | a5f327665a7d112c4afcdbfafd73b61d52da5cee | |
| parent | 2bd0ec871ecbe1eadada22b238a3dd50bfb438a6 (diff) | |
| download | hatari-08bc35c605c825ce.zip hatari-08bc35c605c825ce.tar.gz | |
Drop portaudio from the CI files, too
And while we're at it, update the Fedora image in the gitlab CI
| -rw-r--r-- | .cirrus.yml | 3 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 694edea..77902bd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,7 +6,7 @@ fedora_task: install_script: - dnf update -y - dnf install -y cmake make gcc diffutils python-unversioned-command - GraphicsMagick SDL2-devel libpng-devel zlib-devel portaudio-devel + GraphicsMagick SDL2-devel libpng-devel zlib-devel script: - mkdir build - cd build @@ -85,7 +85,6 @@ msys2_task: mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL2 mingw-w64-x86_64-libpng - mingw-w64-x86_64-portaudio mingw-w64-x86_64-portmidi" script: - C:\tools\msys64\usr\bin\bash -lc "cmake -G 'MSYS Makefiles' ." diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37f5b94..1c37019 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ build-normal: build-alt: script: - - apt-get install -y -qq cmake libsdl2-dev portaudio19-dev libportmidi-dev + - apt-get install -y -qq cmake libsdl2-dev libportmidi-dev - rm -rf /usr/include/zlib.h /usr/include/png.h /usr/include/readline* - ./configure --disable-small-mem --disable-dsp --enable-debug --disable-tracing - make @@ -32,13 +32,13 @@ build-32bit: build-clang: script: - apt-get install -y -qq cmake clang libsdl2-dev libpng-dev zlib1g-dev - libudev-dev portaudio19-dev libportmidi-dev tidy + libudev-dev libportmidi-dev tidy - CC="clang" CFLAGS="-O3 -Werror" ./configure --enable-debug - make - make test build-mingw: - image: fedora:33 + image: fedora:latest before_script: - dnf update -y - dnf install -y cmake make gcc python-unversioned-command mingw32-gcc |