diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5447fe7f8c3294969d5b5aa7f9d34a76cacef9bf..d8a6f42472873377733f203520bc492965bb319f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,20 +63,22 @@ default:
- - echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
- echo Adding ccache configution option
- - mkdir --parents --verbose ~/.ccache
- touch ~/.ccache/ccache.conf
- - echo base_dir = "$PWD" | tee ~/.ccache/ccache.conf
- - echo cache_dir = "$PWD/ccache" | tee ~/.ccache/ccache.conf
- - echo compiler_check = content | tee ~/.ccache/ccache.conf
- - echo stats_log = "$PWD/ccache_statslog" | tee ~/.ccache/ccache.conf
- - echo max_size = 50M | tee ~/.ccache/ccache.conf
+ - echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf
+ - echo cache_dir = $PWD/ccache | tee --append ~/.ccache/ccache.conf
+ - echo compiler_check = content | tee --append ~/.ccache/ccache.conf
+ - echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
+ - echo max_size = 50M | tee --append ~/.ccache/ccache.conf
- echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
- ccache --zero-stats || true
- ccache --show-stats || true
after_script:
- - *aptcache
- - apt-get autoclean
+ - - 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"
+
- ccache --show-stats
- ccache --show-log-stats || true
@@ -89,13 +91,15 @@ build-testing:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
script:
- - *aptcache
- - 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"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- 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"
- 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"
@@ -107,10 +111,11 @@ build-i686-w64-mingw32:
- "bin/srb2win.exe*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
script:
- - *aptcache
- - 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"
- 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"
@@ -122,17 +127,20 @@ build-x86_64-linux-gnu:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
script:
- - *aptcache
- - 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"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
- export CC=x86_64-linux-gnu-gcc
- export OBJCOPY=x86_64-linux-gnu-objcopy
- 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"
- 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"
@@ -144,17 +152,20 @@ build-i686-linux-gnu:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
script:
- - *aptcache
- - 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"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
- export CC=i686-linux-gnu-gcc
- export OBJCOPY=i686-linux-gnu-objcopy
- 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"
- 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"
@@ -166,17 +177,20 @@ build-aarch64-linux-gnu:
- "bin/lsdl2srb2*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
script:
- - *aptcache
- - 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"
+
- - echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0Kinstalling development packages"
- apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
- echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
+
- export CC=aarch64-linux-gnu-gcc
- export OBJCOPY=aarch64-linux-gnu-objcopy
- 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"
- 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"
@@ -188,10 +202,11 @@ build-x86_64-w64-mingw32:
- "bin/srb2win64.exe*"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
script:
- - *aptcache
- - 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"
- 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"