mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-02-16 09:02:06 +00:00
Update .gitlab-ci.yml file
Move the exports to variables section
This commit is contained in:
parent
50d8cb4c00
commit
4904177312
1 changed files with 29 additions and 21 deletions
|
@ -10,6 +10,8 @@ default:
|
|||
GIT_STRATEGY: clone
|
||||
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
CCACHE: 1
|
||||
ERRORMODE: 1
|
||||
cache:
|
||||
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
|
||||
fallback_keys:
|
||||
|
@ -86,6 +88,8 @@ build-testing:
|
|||
paths:
|
||||
- "bin/lsdl2srb2*"
|
||||
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing"
|
||||
variables:
|
||||
CC: gcc
|
||||
script:
|
||||
- - echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
|
||||
- apt-get install gcc
|
||||
|
@ -96,7 +100,7 @@ build-testing:
|
|||
- 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 --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
|
||||
- make --directory=src --keep-going NONX86=1 || make --directory=src --keep-going NONX86=1
|
||||
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||
|
||||
build-i686-w64-mingw32:
|
||||
|
@ -105,13 +109,15 @@ build-i686-w64-mingw32:
|
|||
paths:
|
||||
- "bin/srb2win.exe*"
|
||||
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
|
||||
variables:
|
||||
PREFIX: i686-w64-mingw32
|
||||
script:
|
||||
- - 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"
|
||||
|
||||
- - 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
|
||||
- make --directory=src --keep-going MINGW=1 || make --directory=src --keep-going MINGW=1
|
||||
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||
|
||||
build-x86_64-linux-gnu:
|
||||
|
@ -120,6 +126,11 @@ build-x86_64-linux-gnu:
|
|||
paths:
|
||||
- "bin/lsdl2srb2*"
|
||||
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
|
||||
variables:
|
||||
CC: x86_64-linux-gnu-gcc
|
||||
OBJCOPY: x86_64-linux-gnu-objcopy
|
||||
OBJDUMP: x86_64-linux-gnu-objdump
|
||||
PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig
|
||||
script:
|
||||
- - 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
|
||||
|
@ -129,13 +140,8 @@ build-x86_64-linux-gnu:
|
|||
- 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[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
|
||||
- make --directory=src --keep-going LINUX64=1 || make --directory=src --keep-going LINUX64=1
|
||||
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||
|
||||
build-i686-linux-gnu:
|
||||
|
@ -144,6 +150,11 @@ build-i686-linux-gnu:
|
|||
paths:
|
||||
- "bin/lsdl2srb2*"
|
||||
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
|
||||
variables:
|
||||
CC: i686-linux-gnu-gcc
|
||||
OBJCOPY: i686-linux-gnu-objcopy
|
||||
OBJDUMP: i686-linux-gnu-objdump
|
||||
PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
|
||||
script:
|
||||
- - 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
|
||||
|
@ -153,13 +164,8 @@ build-i686-linux-gnu:
|
|||
- 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[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
|
||||
- make --directory=src --keep-going LINUX=1 || make --directory=src --keep-going LINUX=1
|
||||
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||
|
||||
build-aarch64-linux-gnu:
|
||||
|
@ -168,6 +174,11 @@ build-aarch64-linux-gnu:
|
|||
paths:
|
||||
- "bin/lsdl2srb2*"
|
||||
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
|
||||
variables:
|
||||
CC: aarch64-linux-gnu-gcc
|
||||
OBJCOPY: aarch64-linux-gnu-objcopy
|
||||
OBJDUMP: aarch64-linux-gnu-objdump
|
||||
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
|
||||
script:
|
||||
- - 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
|
||||
|
@ -177,13 +188,8 @@ build-aarch64-linux-gnu:
|
|||
- 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[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
|
||||
- make --directory=src --keep-going LINUX64=1 NONX86=1 || make --directory=src --keep-going LINUX64=1 NONX86=1
|
||||
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||
|
||||
build-x86_64-w64-mingw32:
|
||||
|
@ -192,11 +198,13 @@ build-x86_64-w64-mingw32:
|
|||
paths:
|
||||
- "bin/srb2win64.exe*"
|
||||
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
|
||||
variables:
|
||||
PREFIX: x86_64-w64-mingw32
|
||||
script:
|
||||
- - 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"
|
||||
|
||||
- - 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
|
||||
- make --directory=src --keep-going MINGW64=1 || make --directory=src --keep-going MINGW64=1
|
||||
- echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
|
||||
|
|
Loading…
Reference in a new issue