diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea0d6668f..206d1d888 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,6 @@
stages: # List of stages for jobs, and their order of execution
- build
-.aptcache_Scripts: &aptcache
- export APT_CACHE_DIR=`pwd`/apt-cache;
- export DEBIAN_FRONTEND=noninteractive;
-
default:
image: debian:stable-slim
@@ -13,6 +9,7 @@ default:
variables:
GIT_STRATEGY: clone
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
+ DEBIAN_FRONTEND: noninteractive
cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
fallback_keys:
@@ -32,27 +29,21 @@ default:
- dpkg --add-architecture arm64
- echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:ac_pre[collapsed=true]\r\e[0KSetting up APT cache"
- - *aptcache
- - echo -e "\e[0Ksection_end:`date +%s`:ac_pre\r\e[0K"
-
- - echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
+ - export APT_CACHE_DIR=`pwd`/apt-cache
- touch /etc/apt/apt.conf.d/99build
- echo Adding options to apt.conf':'
- echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build
- echo quiet "1"\; | tee --append /etc/apt/apt.conf.d/99build
- echo APT::Get::Assume-Yes "true"\; | tee --append /etc/apt/apt.conf.d/99build
- echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
+ - mkdir --parents --verbose $APT_CACHE_DIR/partial/
- echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
- - echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
- apt-get update
- echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_cache[collapsed=true]\r\e[0KMaking APT cache directory"
- - mkdir --parents --verbose $APT_CACHE_DIR/partial/
- - echo -e "\e[0Ksection_end:`date +%s`:apt_cache\r\e[0K"
-
- - echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
- apt-get install apt-utils
- echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
@@ -72,19 +63,19 @@ default:
- echo max_size = 50M | tee --append ~/.ccache/ccache.conf
- echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:apt_reset[collapsed=true]\r\e[0KResetting ccache statistics"
- - ccache --zero-stats || true
- - ccache --show-stats || true
+ - - echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
+ - ccache --zero-stats
+ - ccache --show-stats
- echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
+
after_script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
- - *aptcache
- apt-get autoclean
- echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=false]\r\e[0Kccache statistics:"
+ - - echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
- ccache --show-stats --verbose
- - ccache --show-log-stats --verbose || true
+ - ccache --show-log-stats --verbose
- echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
build-testing:
@@ -97,7 +88,6 @@ build-testing:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - *aptcache
- apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -105,7 +95,7 @@ build-testing:
- apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -117,11 +107,10 @@ build-i686-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - *aptcache
- apt-get install gcc-mingw-w64-i686-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -133,7 +122,6 @@ build-x86_64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - *aptcache
- apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -146,7 +134,7 @@ build-x86_64-linux-gnu:
- export OBJDUMP=x86_64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -158,7 +146,6 @@ build-i686-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - *aptcache
- apt-get install gcc-i686-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -171,7 +158,7 @@ build-i686-linux-gnu:
- export OBJDUMP=i686-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -183,7 +170,6 @@ build-aarch64-linux-gnu:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - *aptcache
- apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
@@ -196,7 +182,7 @@ build-aarch64-linux-gnu:
- export OBJDUMP=aarch64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
- - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -208,10 +194,9 @@ build-x86_64-w64-mingw32:
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
- - *aptcache
- apt-get install gcc-mingw-w64-x86-64-win32
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
- - - echo -e "\e[0Ksection_start:`date +%s`:make\r\e[0KCompiling SRB2"
+ - - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
- make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"