From ace03bde0bab0bf84e0e1efe4e42cfe0e37dc32d Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Thu, 1 Apr 2021 10:37:18 +0300
Subject: [PATCH] - updated continuous integration settings

* Install compilers for Linux targets explicitly
* Specify compilers for Linux target by executable names instead of full paths
* Switch to latest Clang target to 11
* Use ZMusic 1.1.6
---
 .github/workflows/continuous_integration.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
index 3c603963d..4cd5b7486 100644
--- a/.github/workflows/continuous_integration.yml
+++ b/.github/workflows/continuous_integration.yml
@@ -38,30 +38,30 @@ jobs:
         - {
             name: "Linux GCC 7",
             os: ubuntu-20.04,
-            extra_options: "-DCMAKE_C_COMPILER=/usr/bin/gcc-7 -DCMAKE_CXX_COMPILER=/usr/bin/g++-7",
-            deps_cmdline: "sudo apt update && sudo apt install libsdl2-dev libvpx-dev libgtk2.0-dev gcc-7 g++-7",
+            extra_options: "-DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7",
+            deps_cmdline: "sudo apt update && sudo apt install g++-7 libsdl2-dev libvpx-dev libgtk2.0-dev",
             build_type: "RelWithDebInfo"
           }
         - {
             name: "Linux GCC 10",
             os: ubuntu-20.04,
-            extra_options: "-DCMAKE_C_COMPILER=/usr/bin/gcc-10 -DCMAKE_CXX_COMPILER=/usr/bin/g++-10",
-            deps_cmdline: "sudo apt update && sudo apt install libsdl2-dev libvpx-dev libgtk-3-dev",
+            extra_options: "-DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10",
+            deps_cmdline: "sudo apt update && sudo apt install g++-10 libsdl2-dev libvpx-dev libgtk-3-dev",
             build_type: "MinSizeRel"
           }
         - {
             name: "Linux Clang 6",
             os: ubuntu-20.04,
-            extra_options: "-DCMAKE_C_COMPILER=/usr/bin/clang-6.0 -DCMAKE_CXX_COMPILER=/usr/bin/clang++-6.0 \
+            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",
             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"
           }
         - {
-            name: "Linux Clang 10",
+            name: "Linux Clang 11",
             os: ubuntu-20.04,
-            extra_options: "-DCMAKE_C_COMPILER=/usr/bin/clang-10 -DCMAKE_CXX_COMPILER=/usr/bin/clang++-10",
-            deps_cmdline: "sudo apt update && sudo apt install libsdl2-dev libvpx-dev",
+            extra_options: "-DCMAKE_C_COMPILER=clang-11 -DCMAKE_CXX_COMPILER=clang++-11",
+            deps_cmdline: "sudo apt update && sudo apt install clang-11 libsdl2-dev libvpx-dev",
             build_type: "Release"
           }
 
@@ -79,7 +79,7 @@ jobs:
         cd build
         git clone https://github.com/coelckers/ZMusic.git
         cd ZMusic
-        git checkout 1.1.4
+        git checkout 1.1.6
         cd ..
         cmake -B zmusic_build -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -DCMAKE_INSTALL_PREFIX=`pwd`/zmusic_install ${{ matrix.config.extra_options }} ZMusic
         cmake --build zmusic_build --target install --parallel 3