From 957a23d2820d54f5e92ae6227104f35a7cdc4b1b Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Wed, 25 Aug 2021 11:09:38 +0300
Subject: [PATCH] - updated continuous integration workflow
* Switch from macOS 10.15 to 11, Xcode 12.4 to 12.5
* Switch from Clang 11 to 12
* Remove no longer needed workaround for Clang 6 with GCC 11 deinstallation
---
.github/workflows/continuous_integration.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
index a5d8495a0..8a8197a26 100644
--- a/.github/workflows/continuous_integration.yml
+++ b/.github/workflows/continuous_integration.yml
@@ -24,13 +24,13 @@ jobs:
}
- {
name: "macOS",
- os: macos-10.15,
+ os: macos-11,
deps_cmdline: "brew install libvpx",
build_type: "Release"
}
- {
name: "macOS",
- os: macos-10.15,
+ os: macos-11,
extra_options: "-DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF",
deps_cmdline: "brew install libvpx fluidsynth mpg123 libsndfile",
build_type: "Debug"
@@ -54,14 +54,14 @@ jobs:
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",
- deps_cmdline: "sudo apt update && sudo apt remove gcc-11 libgcc-11-dev g++-11 libstdc++-11-dev && sudo apt install clang-6.0 libstdc++-9-dev libsdl2-dev libvpx-dev libopenal-dev libfluidsynth-dev libmpg123-dev libsndfile1-dev",
+ 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 11",
+ name: "Linux Clang 12",
os: ubuntu-20.04,
- 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",
+ extra_options: "-DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12",
+ deps_cmdline: "sudo apt update && sudo apt install clang-12 libsdl2-dev libvpx-dev",
build_type: "Release"
}