From f086d78a3abb002e45a6f21b765e90e23519083c Mon Sep 17 00:00:00 2001 From: androm3da Date: Sun, 11 Feb 2018 17:50:28 -0600 Subject: [PATCH] [CI] remove Trusty, add hashes --- .gitlab-ci.yml | 11 ++++++----- ci/{build.sh => build-gitlab.sh} | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) rename ci/{build.sh => build-gitlab.sh} (98%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 640e05c8..23dff7f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ variables: - csa_results script: - - ./ci/build.sh + - ./ci/build-gitlab.sh Arch Linux: @@ -36,10 +36,11 @@ Arch Linux: script: - mkdir -p csa_results/ - - scan-build -o csa_results/ ./ci/build.sh + - scan-build -o csa_results/ ./ci/build-gitlab.sh -Ubuntu Linux Trusty: +# Disabled, dependency on newer Qt than avail +.Ubuntu Linux Trusty: <<: *linux_cfg stage: build image: ubuntu:trusty @@ -115,7 +116,7 @@ Ubuntu Linux Xenial: - osx script: - - ./ci/build.sh + - ./ci/build-gitlab.sh # DISABLED for now .Alpine Linux: @@ -128,5 +129,5 @@ Ubuntu Linux Xenial: - apk add --update alpine-sdk autoconf automake libtool clang-dev cmake ninja qt5-qtbase-dev qt5-qttools-dev boost-dev ttf-freefont xvfb script: - - ./ci/build.sh + - ./ci/build-gitlab.sh diff --git a/ci/build.sh b/ci/build-gitlab.sh similarity index 98% rename from ci/build.sh rename to ci/build-gitlab.sh index 82d834f7..50f66486 100755 --- a/ci/build.sh +++ b/ci/build-gitlab.sh @@ -74,6 +74,7 @@ run_build() { cmake --build ${PWD} -- -v cmake --build ${PWD} -- install -v cpack -G ${CPACK_TYPE} ${PWD} + sha1sum *.tar* > SHA1SUMS } run_build