Commit 4b1efbf5 authored by Bennet Bleßmann's avatar Bennet Bleßmann

Merge branch 'master-setup-ci' into 'master'

Split run_download_make CI job and adjust custom section title style to match build in sections

See merge request !16
parents 0024c529 95afccfd
Pipeline #1392 passed with stages
in 215 minutes and 24 seconds
......@@ -113,20 +113,34 @@ run_make:
- src/pakcsversion.pl
- src/prologbasics.pl
# only run for the nightly download test run
run_download_make:
# template for test_download_src and test_download_amd64_linux
.test_download:
stage: test
tags:
- docker2
rules:
# only run for the nightly download test run
- if: '$TEST_DOWNLOAD == "yes"'
variables:
# may differ from default version above if download and current branch don't use the same version
CURRY_CHECK_VERSION: "2.0.0"
timeout: 3h
timeout: 2h
before_script:
- source ci/make_download.sh
script:
- build_download_pakcs "${DOWNLOAD_VERSION}" tar_version
# instance of .test_download to test src tar
test_download_src:
extends: .test_download
script:
- build_download_pakcs "${DOWNLOAD_VERSION}" src
# instance of .test_download to test amd64-Linux tar
test_download_amd64_linux:
extends: .test_download
script:
- ci/make_download.sh
- build_download_pakcs "${DOWNLOAD_VERSION}" amd64-Linux
# check that the tag version matches pakcs version
# this failing indicates an incorrect tag version or
......
......@@ -187,7 +187,7 @@ make | run_make
| |
| +-------------+---------+------------+------------+
| | | | | |
test | | | | run_test check_version run_download_make
test | | | | run_test check_version test_download_src test_download_amd64_linux
| | | |
| | | +----------+-------------------+
| | v v v v
......
......@@ -23,6 +23,10 @@ gen_currycheck() {
}
build_download_pakcs() {
mkdir -p download
pushd download
VERSION=$1 # version number
DLVERSION=$2 # download version (src, amd64-Linux)
......@@ -57,13 +61,6 @@ build_download_pakcs() {
end_section "test_${PAKCSVERSION}_${DLVERSION}"
popd
popd # pop "${PAKCSVERSION}"
popd # pop download
}
mkdir -p download
pushd download
build_download_pakcs "${DOWNLOAD_VERSION}" src
build_download_pakcs "${DOWNLOAD_VERSION}" amd64-Linux
popd
......@@ -8,7 +8,7 @@
function start_section() {
id=$1
title=$2
echo -e "\e[0Ksection_start:$(date +%s):${id}[collapsed=true]\r\e[0K\e[96m${title}\e[0m"
echo -e "\e[0Ksection_start:$(date +%s):${id}[collapsed=true]\r\e[0K\e[36;1m${title}\e[0m"
}
#
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment