Move some CI jobs to newer compiler versions

1 files changed, 16 insertions, 14 deletions

diff --git a/util/ci/common.sh b/util/ci/common.sh
index 3015680c4..c9271e813 100644
--- a/util/ci/common.sh
+++ b/util/ci/common.sh
@@ -2,10 +2,12 @@
 
 # Linux build only
 install_linux_deps() {
-	local pkgs=(cmake libpng-dev \
-		libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
-		libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \
-		gettext libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev)
+	local pkgs=(
+		cmake gettext
+		libpng-dev libjpeg-dev libxi-dev libgl1-mesa-dev
+		libsqlite3-dev libhiredis-dev libogg-dev libgmp-dev libvorbis-dev
+		libopenal-dev libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev
+	)
 
 	if [[ "$1" == "--no-irr" ]]; then
 		shift
@@ -16,17 +18,17 @@ install_linux_deps() {
 	fi
 
 	sudo apt-get update
-	sudo apt-get install -y --no-install-recommends ${pkgs[@]} "$@"
+	sudo apt-get install -y --no-install-recommends "${pkgs[@]}" "$@"
 }
 
-# Mac OSX build only
-install_macosx_deps() {
+# macOS build only
+install_macos_deps() {
+	local pkgs=(
+		cmake gettext freetype gmp jpeg-turbo jsoncpp leveldb
+		libogg libpng libvorbis luajit zstd
+	)
 	brew update
-	brew install freetype gettext hiredis irrlicht leveldb libogg libvorbis luajit
-	if brew ls | grep -q jpeg; then
-		brew upgrade jpeg
-	else
-		brew install jpeg
-	fi
-	#brew upgrade postgresql
+	brew install "${pkgs[@]}"
+	brew unlink $(brew ls --formula)
+	brew link "${pkgs[@]}"
 }