mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-02-16 09:02:06 +00:00
Update .gitlab-ci.yml file
Retry building so we point out why it failed to compile
This commit is contained in:
parent
af020810bf
commit
796adec979
1 changed files with 7 additions and 6 deletions
|
@ -37,6 +37,7 @@ default:
|
|||
CCACHE_MAXSIZE: "50M"
|
||||
GIT_STRATEGY: clone
|
||||
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
|
||||
ENV DEBIAN_FRONTEND: noninteractive
|
||||
cache:
|
||||
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
|
||||
fallback_keys:
|
||||
|
@ -80,7 +81,7 @@ build-i686-linux-gnu:
|
|||
- export OBJDUMP=i686-linux-gnu-objdump
|
||||
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
|
||||
- *ccache
|
||||
- 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 CCACHE=1 ERRORMODE=1 LINUX=1
|
||||
|
||||
build-aarch64-linux-gnu:
|
||||
<<: *job_build
|
||||
|
@ -97,7 +98,7 @@ build-aarch64-linux-gnu:
|
|||
- export OBJDUMP=aarch64-linux-gnu-objdump
|
||||
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
|
||||
- *ccache
|
||||
- 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 CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
|
||||
|
||||
build-x86_64-linux-gnu:
|
||||
<<: *job_build
|
||||
|
@ -114,7 +115,7 @@ build-x86_64-linux-gnu:
|
|||
- export OBJDUMP=x86_64-linux-gnu-objdump
|
||||
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
|
||||
- *ccache
|
||||
- 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 CCACHE=1 ERRORMODE=1 LINUX64=1
|
||||
|
||||
build-i686-w64-mingw32:
|
||||
<<: *job_build
|
||||
|
@ -126,7 +127,7 @@ build-i686-w64-mingw32:
|
|||
- *aptcache
|
||||
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-i686-win32
|
||||
- *ccache
|
||||
- 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 CCACHE=1 ERRORMODE=1 MINGW=1 PREFIX=i686-w64-mingw32
|
||||
|
||||
build-x86_64-w64-mingw32:
|
||||
<<: *job_build
|
||||
|
@ -138,7 +139,7 @@ build-x86_64-w64-mingw32:
|
|||
- *aptcache
|
||||
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc-mingw-w64-x86-64-win32
|
||||
- *ccache
|
||||
- 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 CCACHE=1 ERRORMODE=1 MINGW64=1 PREFIX=x86_64-w64-mingw32
|
||||
|
||||
build-testing:
|
||||
<<: *job_build
|
||||
|
@ -153,4 +154,4 @@ build-testing:
|
|||
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install gcc
|
||||
- apt-get --no-install-recommends --quiet --quiet --yes --option dir::cache::archives="$APT_CACHE_DIR" install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
|
||||
- *ccache
|
||||
- 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 CCACHE=1 ERRORMODE=1 NONX86=1
|
Loading…
Reference in a new issue