diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa9a0b1..3ff5af5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,16 +1,4 @@ -debian: - image: debian:stretch - variables: - BUILD_SCRIPT: "debian_ci.sh" - APT_INSTALL: "clang" - script: - - .gitlab/gitlab.sh - artifacts: - name: "gta5view-$CI_COMMIT_REF_NAME-debian" - paths: - - assets/*.deb - -windows: +Windows Portable: image: syping/qt5-static-mingw:5.9.6 variables: BUILD_SCRIPT: "windows_build.sh" @@ -18,6 +6,18 @@ windows: script: - .gitlab/gitlab.sh artifacts: - name: "gta5view-$CI_COMMIT_REF_NAME-windows" + name: "gta5view-$CI_COMMIT_REF_NAME-wp" paths: - - assets/*.exe + - "gta5view-*.exe" + +Windows Installer: + image: syping/qt5-shared-mingw:5.9.6 + variables: + BUILD_SCRIPT: "wininstall_build.sh" + QT_SELECT: "qt5-x86_64-w64-mingw32" + script: + - .gitlab/gitlab.sh + artifacts: + name: "gta5view-$CI_COMMIT_REF_NAME-wi" + paths: + - "gta5view-*.exe" diff --git a/.gitlab/gitlab.sh b/.gitlab/gitlab.sh index c87d9c3..c7436a2 100755 --- a/.gitlab/gitlab.sh +++ b/.gitlab/gitlab.sh @@ -2,7 +2,7 @@ # Install curl and lua apt-get update -qq && \ -apt-get install -qq curl git lua5.2 openssl +apt-get install -qq curl git lua5.2 nsis openssl # Decrypt Telemetry Authenticator rm -rf tmext/TelemetryClassAuthenticator.cpp && \ @@ -20,4 +20,6 @@ if [ "${PACKAGE_CODE}" == "" ]; then export PACKAGE_CODE=GitLab fi -.ci/ci.sh +# Start CI script and copying assets into base directory +.ci/ci.sh && \ +cp -Rf assets/* ./