From 7c08e1486e610c7766764fb344ffe7d687c2687b Mon Sep 17 00:00:00 2001 From: Syping Date: Fri, 22 Jun 2018 20:00:18 +0200 Subject: [PATCH] add Debian build to GitLab CI --- .ci/debian_ci.sh | 8 ++++++++ .gitlab-ci.yml | 30 +++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100755 .ci/debian_ci.sh diff --git a/.ci/debian_ci.sh b/.ci/debian_ci.sh new file mode 100755 index 0000000..89134ac --- /dev/null +++ b/.ci/debian_ci.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# Install packages +.ci/debian_install.sh && \ + +# Build gta5view +.ci/debian_build.sh && \ +cd ${PROJECT_DIR} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e45ef4..1b8f2e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,29 @@ -image: syping/qt5-static-mingw:5.9.6 +debian32: + image: i386/debian:stretch + variables: + BUILD_SCRIPT: "debian_ci.sh" + APT_INSTALL: "clang" + script: + - .gitlab/gitlab.sh + artifacts: + name: "gta5view-$CI_COMMIT_REF_NAME-debian32" + paths: + - assets/*.deb + +debian64: + image: amd64/debian:stretch + variables: + BUILD_SCRIPT: "debian_ci.sh" + APT_INSTALL: "clang" + script: + - .gitlab/gitlab.sh + artifacts: + name: "gta5view-$CI_COMMIT_REF_NAME-debian64" + paths: + - assets/*.deb win32: + image: syping/qt5-static-mingw:5.9.6 variables: BUILD_SCRIPT: "windows_build.sh" QT_SELECT: "qt5-i686-w64-mingw32" @@ -9,9 +32,10 @@ win32: artifacts: name: "gta5view-$CI_COMMIT_REF_NAME-win32" paths: - - assets/ + - assets/*.exe win64: + image: syping/qt5-static-mingw:5.9.6 variables: BUILD_SCRIPT: "windows_build.sh" QT_SELECT: "qt5-x86_64-w64-mingw32" @@ -21,4 +45,4 @@ win64: artifacts: name: "gta5view-$CI_COMMIT_REF_NAME-win64" paths: - - assets/ + - assets/*.exe