From f9880fff70244a50c81a39455cbbbeeb510194d4 Mon Sep 17 00:00:00 2001
From: Syping <schiedelrafael@keppe.org>
Date: Thu, 22 Nov 2018 21:50:53 +0100
Subject: [PATCH] update toolchain

---
 .ci/windows_docker.sh    | 3 +--
 .ci/wininstall_docker.sh | 3 +--
 .gitlab-ci.yml           | 4 ++--
 .gitlab/gitlab.sh        | 4 ----
 .travis/travis.sh        | 7 ++-----
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.ci/windows_docker.sh b/.ci/windows_docker.sh
index 67bc41b..701aa18 100755
--- a/.ci/windows_docker.sh
+++ b/.ci/windows_docker.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-QT_VERSION=5.9.6
-DOCKER_IMAGE=syping/qt5-static-mingw:${QT_VERSION}
+DOCKER_IMAGE=sypingauto/gta5view-build:static
 PROJECT_DIR_DOCKER=/gta5view
 
 cd ${PROJECT_DIR} && \
diff --git a/.ci/wininstall_docker.sh b/.ci/wininstall_docker.sh
index 88726f1..7d55975 100755
--- a/.ci/wininstall_docker.sh
+++ b/.ci/wininstall_docker.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-QT_VERSION=5.9.6
-DOCKER_IMAGE=syping/qt5-shared-mingw:${QT_VERSION}
+DOCKER_IMAGE=sypingauto/gta5view-build:shared
 PROJECT_DIR_DOCKER=/gta5view
 
 cd ${PROJECT_DIR} && \
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2143545..a4edd87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
 
 Windows Installer:
   stage: build
-  image: syping/qt5-shared-mingw:5.9.6
+  image: sypingauto/gta5view-build:shared
   variables:
     BUILD_SCRIPT: "wininstall_build.sh"
     QT_SELECT: "qt5-x86_64-w64-mingw32"
@@ -19,7 +19,7 @@ Windows Installer:
 
 Windows Portable:
   stage: build
-  image: syping/qt5-static-mingw:5.9.6
+  image: sypingauto/gta5view-build:static
   variables:
     BUILD_SCRIPT: "windows_build.sh"
     QT_SELECT: "qt5-x86_64-w64-mingw32"
diff --git a/.gitlab/gitlab.sh b/.gitlab/gitlab.sh
index 76a070f..4b0f4fe 100755
--- a/.gitlab/gitlab.sh
+++ b/.gitlab/gitlab.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# Install curl, git, lua, nsis and openssl
-apt-get update -qq && \
-apt-get install -qq curl git lua5.2 nsis openssl
-
 # Decrypt Telemetry Authenticator
 rm -rf tmext/TelemetryClassAuthenticator.cpp && \
 openssl aes-256-cbc -k $tca_pass -in .gitlab/TelemetryClassAuthenticator.cpp.enc -out tmext/TelemetryClassAuthenticator.cpp -d
diff --git a/.travis/travis.sh b/.travis/travis.sh
index 3938c0a..7dd9437 100755
--- a/.travis/travis.sh
+++ b/.travis/travis.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 
-# Install curl and lua
-if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
-	sudo apt-get update -qq && \
-	sudo apt-get install -qq curl lua5.2
-elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then
+# Install lua
+if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
 	brew install lua
 fi