mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-22 04:21:23 +00:00
Update .gitlab-ci.yml file
place sections around "apt-get install" and "make" commands
This commit is contained in:
parent
806c8f259c
commit
ff3993257a
1 changed files with 36 additions and 0 deletions
|
@ -45,8 +45,12 @@ default:
|
|||
- echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
|
||||
- apt-get update
|
||||
- mkdir --parents --verbose $APT_CACHE_DIR/partial/
|
||||
- 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"
|
||||
- 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"
|
||||
- *ccache
|
||||
- ccache --zero-stats || true
|
||||
- ccache --show-stats || true
|
||||
|
@ -67,10 +71,16 @@ build-testing:
|
|||
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"
|
||||
- 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"
|
||||
- *ccache
|
||||
- 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"
|
||||
|
||||
build-i686-w64-mingw32:
|
||||
<<: *job_build
|
||||
|
@ -80,9 +90,13 @@ build-i686-w64-mingw32:
|
|||
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
|
||||
- apt-get install gcc-mingw-w64-i686-win32
|
||||
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
|
||||
- *ccache
|
||||
- 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"
|
||||
|
||||
build-x86_64-linux-gnu:
|
||||
<<: *job_build
|
||||
|
@ -92,14 +106,20 @@ build-x86_64-linux-gnu:
|
|||
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
|
||||
- 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
|
||||
- *ccache
|
||||
- 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"
|
||||
|
||||
build-i686-linux-gnu:
|
||||
<<: *job_build
|
||||
|
@ -109,14 +129,20 @@ build-i686-linux-gnu:
|
|||
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
|
||||
- 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
|
||||
- *ccache
|
||||
- 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"
|
||||
|
||||
build-aarch64-linux-gnu:
|
||||
<<: *job_build
|
||||
|
@ -126,14 +152,20 @@ build-aarch64-linux-gnu:
|
|||
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
|
||||
- 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
|
||||
- *ccache
|
||||
- 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"
|
||||
|
||||
build-x86_64-w64-mingw32:
|
||||
<<: *job_build
|
||||
|
@ -143,6 +175,10 @@ build-x86_64-w64-mingw32:
|
|||
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
|
||||
- apt-get install gcc-mingw-w64-x86-64-win32
|
||||
- echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
|
||||
- *ccache
|
||||
- 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"
|
||||
|
|
Loading…
Reference in a new issue