From 61d93988d8b44a9905451c4c288e02c04d41abb0 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sat, 2 May 2020 12:52:51 +0200
Subject: ci: Update Github Actions workflows (#9774)

---
 util/ci/build.sh      |  2 +-
 util/ci/clang-tidy.sh |  3 +--
 util/ci/common.sh     | 16 ----------------
 3 files changed, 2 insertions(+), 19 deletions(-)

(limited to 'util')

diff --git a/util/ci/build.sh b/util/ci/build.sh
index 59069b00a..ba77cd645 100755
--- a/util/ci/build.sh
+++ b/util/ci/build.sh
@@ -1,4 +1,4 @@
-#! /bin/bash -eu
+#! /bin/bash -e
 
 mkdir cmakebuild
 cd cmakebuild
diff --git a/util/ci/clang-tidy.sh b/util/ci/clang-tidy.sh
index d048f54ee..bb4e99fef 100755
--- a/util/ci/clang-tidy.sh
+++ b/util/ci/clang-tidy.sh
@@ -5,8 +5,7 @@ cd cmakebuild
 cmake -DCMAKE_BUILD_TYPE=Debug \
 	-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
 	-DRUN_IN_PLACE=TRUE \
-	-DENABLE_GETTEXT=TRUE \
-	-DENABLE_SOUND=FALSE \
+	-DENABLE_{GETTEXT,SOUND}=FALSE \
 	-DBUILD_SERVER=TRUE ..
 make GenerateVersion
 
diff --git a/util/ci/common.sh b/util/ci/common.sh
index 5a4f78457..a2e4beac9 100644
--- a/util/ci/common.sh
+++ b/util/ci/common.sh
@@ -1,21 +1,5 @@
 #!/bin/bash -e
 
-set_linux_compiler_env() {
-	if [[ "${COMPILER}" == "gcc-6" ]]; then
-		export CC=gcc-6
-		export CXX=g++-6
-	elif [[ "${COMPILER}" == "gcc-8" ]]; then
-		export CC=gcc-8
-		export CXX=g++-8
-	elif [[ "${COMPILER}" == "clang-3.9" ]]; then
-		export CC=clang-3.9
-		export CXX=clang++-3.9
-	elif [[ "${COMPILER}" == "clang-9" ]]; then
-		export CC=clang-9
-		export CXX=clang++-9
-	fi
-}
-
 # Linux build only
 install_linux_deps() {
 	local pkgs=(libirrlicht-dev cmake libbz2-dev libpng-dev \
-- 
cgit v1.2.3