diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 527dc1804..a849aea28 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,104 +28,134 @@ variables: before_script: - - | - echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment" + # debconf + echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment" - export DEBIAN_FRONTEND="noninteractive" - export DEBIAN_PRIORITY="low" - export DEBCONF_NONINTERACTIVE_SEEN="true" - | - echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K" - + # debconf + echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg" + # dpkg_aa + echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg" - dpkg --add-architecture i386 - dpkg --add-architecture amd64 - dpkg --add-architecture arm64 - | - echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K" - + # dpkg_aa + echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf" + # apt_conf + echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf" - export APT_CACHE_DIR=`pwd`/apt-cache - mkdir --parents --verbose $APT_CACHE_DIR/partial/ - touch /etc/apt/apt.conf.d/99build - | - echo Adding options to apt.conf':' + # apt.conf + echo Adding options to apt.conf':' - | - echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build + # APT::Install-Recommends + echo APT::Install-Recommends "false"\; | tee --append /etc/apt/apt.conf.d/99build - | - echo quiet "1"\; | tee --append /etc/apt/apt.conf.d/99build + # quit + 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 + # APT::Get::Assume-Yes + 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 + # Dir::Cache::Archives + echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build - | - echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K" - + # apt_conf + 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_update + 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" + # apt_update + echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages" + # apt_pre + 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" + # apt_pre + echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages" + # apt_upgrade + echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages" - apt-get upgrade - | - echo -e "\e[0Ksection_end:`date +%s`:apt_upgraden\r\e[0K" + # apt_update + echo -e "\e[0Ksection_end:`date +%s`:apt_upgrade\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages" + # apt_common + echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages" - apt-get install make git ccache - | - echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K" + # apt_common + echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config" + # ccache_config + echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config" - mkdir --parents --verbose ~/.ccache/ - touch ~/.ccache/ccache.conf - | - echo Adding ccache configution option + # cache.conf + echo Adding ccache configution option - | - echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf + # base_dir + echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf - | - echo cache_dir = $PWD/ccache | tee --append ~/.ccache/ccache.conf + # cache_dir + echo cache_dir = $PWD/ccache | tee --append ~/.ccache/ccache.conf - | - echo compiler_check = content | tee --append ~/.ccache/ccache.conf + # compiler_check + echo compiler_check = content | tee --append ~/.ccache/ccache.conf - | - echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf + # stats_log + echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf - | - echo max_size = 50M | tee --append ~/.ccache/ccache.conf + # max_size + echo max_size = 50M | tee --append ~/.ccache/ccache.conf - | - echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K" + # ccache_config + echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics" + # cache_reset + 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" + # ccache_reset + 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" + # apt_clean + echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages" - apt-get autoclean - | - echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K" + # apt_clean + echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:" + # ccache_stats + echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:" - ccache --show-stats --verbose - ccache --show-log-stats --verbose - | - echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K" + # ccahe_stats + echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K" -build-testing: +Debian testing GCC: <<: *job_build image: debian:testing-slim @@ -133,7 +163,8 @@ build-testing: artifacts: paths: - - "bin/lsdl2srb2*" + - "bin/" + - "src/comptime.h" name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-gcc" variables: @@ -141,29 +172,36 @@ build-testing: script: - - | - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" + # apt_toolchain + echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" - apt-get install gcc - | - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" + # apt_toolchain + 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_development + 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" + # apt_development + echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" + # make + 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" + # make + echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" -build-i686-w64-mingw32: +Windows x86: <<: *job_build artifacts: paths: - - "bin/srb2win.exe*" + - "bin/" + - "src/comptime.h" name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32" variables: @@ -171,23 +209,28 @@ build-i686-w64-mingw32: script: - - | - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" + # apt_toolchain + echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" - apt-get install gcc-mingw-w64-i686-win32 - | - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" + # apt_toolchain + echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" + # make + 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 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 - | - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" + # make + echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" -build-x86_64-linux-gnu: +Debian stable:amd64: <<: *job_build artifacts: paths: - - "bin/lsdl2srb2*" + - "bin/" + - "src/comptime.h" name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64" variables: @@ -198,29 +241,36 @@ build-x86_64-linux-gnu: script: - - | - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" + # apt_toolchain + echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" - apt-get install gcc-x86-64-linux-gnu || apt-get install gcc - | - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" + # apt_toolchain + 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_development + 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" + # apt_development + echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" + # make + 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" + # make + echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" -build-i686-linux-gnu: +Debian stable:i386: <<: *job_build artifacts: paths: - - "bin/lsdl2srb2*" + - "bin/" + - "src/comptime.h" name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686" variables: @@ -231,29 +281,36 @@ build-i686-linux-gnu: script: - - | - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" + # apt_toolchain + echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" - apt-get install gcc-i686-linux-gnu || apt-get install gcc - | - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" + # apt_toolchain + 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_development + 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" + # apt_development + echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" + # make + 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" + # make + echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" -build-aarch64-linux-gnu: +Debian stable:arm64: <<: *job_build artifacts: paths: - - "bin/lsdl2srb2*" + - "bin/" + - "src/comptime.h" name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64" variables: @@ -264,29 +321,37 @@ build-aarch64-linux-gnu: script: - - | - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" + # apt_toolchain + echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc - | - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" + # apt_toolchain + 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_development + 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" + # apt_development + echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" + # make + 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 ERRORMODE=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" + # make + echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" -build-x86_64-w64-mingw32: +Windows x64: <<: *job_build artifacts: paths: - - "bin/srb2win64.exe*" + - "bin/" + - "src/comptime.h" + expose_as: "Win64" name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64" variables: @@ -294,25 +359,31 @@ build-x86_64-w64-mingw32: script: - - | - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" + # apt_toolchain + echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" - apt-get install gcc-mingw-w64-x86-64-win32 - | - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" + # apt_toolchain + echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" + # make + 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 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 - | - echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" + # make + echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" -build-clang: +Debian stable Clang: <<: *job_build allow_failure: true artifacts: paths: - - "bin/lsdl2srb2*" + - "bin/" + - "src/comptime.h" + expose_as: "Debian with clang" name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-clang" variables: @@ -321,34 +392,40 @@ build-clang: script: - - | - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" + # apt_toolchain + echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages" - apt-get install clang - | - echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K" + # apt_toolchain + 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_development + 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" + # apt_development + echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K" - - | - echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" + # make + 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" + # make + echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" -build-clang-testing: - <<: *job_build - - extends: build-clang +Debian testing Clang: + extends: Debian stable Clang image: debian:testing-slim artifacts: paths: - - "bin/lsdl2srb2*" + - "bin/" + - "src/comptime.h" + expose_as: "Debian testing with clang" name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-clang" variables: