update toolchain

This commit is contained in:
Syping 2018-11-22 21:50:53 +01:00
parent 7ba5322643
commit f9880fff70
5 changed files with 6 additions and 15 deletions

View file

@ -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} && \

View file

@ -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} && \

View file

@ -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"

View file

@ -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

View file

@ -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