From d2c9a0fcde7b6ba87e673a389e2ec9630e86173b Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 18 Jun 2022 13:14:27 +0300 Subject: [PATCH] - updated continuous integration workflow * Use macOS 12 runners * Test Xcode project generation in addition to Makefile one * Remove obsolete CMake options * Use ZMusic 1.1.9 --- .github/workflows/continuous_integration.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 42ceb320bc..e06d0c3e68 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -30,14 +30,14 @@ jobs: } - { name: "macOS", - os: macos-11, + os: macos-12, deps_cmdline: "brew install libvpx", build_type: "Release" } - { name: "macOS", - os: macos-11, - extra_options: "-DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF", + os: macos-12, + extra_options: "-G Xcode -DDYN_OPENAL=OFF", deps_cmdline: "brew install libvpx fluidsynth mpg123 libsndfile", build_type: "Debug" } @@ -58,8 +58,7 @@ jobs: - { name: "Linux Clang 6", os: ubuntu-20.04, - extra_options: "-DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 \ - -DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF", + extra_options: "-DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 -DDYN_OPENAL=OFF", deps_cmdline: "sudo apt update && sudo apt install clang-6.0 libsdl2-dev libvpx-dev libopenal-dev libfluidsynth-dev libmpg123-dev libsndfile1-dev", build_type: "Debug" } @@ -82,9 +81,9 @@ jobs: fi mkdir build if [[ "${{ runner.os }}" == 'macOS' ]]; then - export ZMUSIC_PACKAGE=zmusic-1.1.7-macos.tar.bz2 + export ZMUSIC_PACKAGE=zmusic-1.1.9-macos.tar.xz elif [[ "${{ runner.os }}" == 'Linux' ]]; then - export ZMUSIC_PACKAGE=zmusic-1.1.7-linux.tar.bz2 + export ZMUSIC_PACKAGE=zmusic-1.1.9-linux.tar.xz fi if [[ ! -z "${ZMUSIC_PACKAGE}" ]]; then cd build