Syping
/
gta5view
1
0
Fork 0
Code Issues Pull Requests Releases 12 Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.ci/windows_docker.sh
View File

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
QT_VERSION=5.9.6 DOCKER_IMAGE=sypingauto/gta5view-build:static
DOCKER_IMAGE=syping/qt5-static-mingw:${QT_VERSION}
PROJECT_DIR_DOCKER=/gta5view PROJECT_DIR_DOCKER=/gta5view
cd ${PROJECT_DIR} && \ cd ${PROJECT_DIR} && \

3
.ci/wininstall_docker.sh
View File

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
QT_VERSION=5.9.6 DOCKER_IMAGE=sypingauto/gta5view-build:shared
DOCKER_IMAGE=syping/qt5-shared-mingw:${QT_VERSION}
PROJECT_DIR_DOCKER=/gta5view PROJECT_DIR_DOCKER=/gta5view
cd ${PROJECT_DIR} && \ cd ${PROJECT_DIR} && \

4
.gitlab-ci.yml
View File

@ -6,7 +6,7 @@ variables:
Windows Installer: Windows Installer:
stage: build stage: build
image: syping/qt5-shared-mingw:5.9.6 image: sypingauto/gta5view-build:shared
variables: variables:
BUILD_SCRIPT: "wininstall_build.sh" BUILD_SCRIPT: "wininstall_build.sh"
QT_SELECT: "qt5-x86_64-w64-mingw32" QT_SELECT: "qt5-x86_64-w64-mingw32"
@ -19,7 +19,7 @@ Windows Installer:
Windows Portable: Windows Portable:
stage: build stage: build
image: syping/qt5-static-mingw:5.9.6 image: sypingauto/gta5view-build:static
variables: variables:
BUILD_SCRIPT: "windows_build.sh" BUILD_SCRIPT: "windows_build.sh"
QT_SELECT: "qt5-x86_64-w64-mingw32" QT_SELECT: "qt5-x86_64-w64-mingw32"

4
.gitlab/gitlab.sh
View File

@ -1,9 +1,5 @@
#!/bin/bash #!/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 # Decrypt Telemetry Authenticator
rm -rf tmext/TelemetryClassAuthenticator.cpp && \ rm -rf tmext/TelemetryClassAuthenticator.cpp && \
openssl aes-256-cbc -k $tca_pass -in .gitlab/TelemetryClassAuthenticator.cpp.enc -out tmext/TelemetryClassAuthenticator.cpp -d openssl aes-256-cbc -k $tca_pass -in .gitlab/TelemetryClassAuthenticator.cpp.enc -out tmext/TelemetryClassAuthenticator.cpp -d

7
.travis/travis.sh
View File

@ -1,10 +1,7 @@
#!/bin/bash #!/bin/bash
# Install curl and lua # Install lua
if [ "${TRAVIS_OS_NAME}" == "linux" ]; then if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
sudo apt-get update -qq && \
sudo apt-get install -qq curl lua5.2
elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then
brew install lua brew install lua
fi fi