mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-14 17:01:07 +00:00
Update .gitlab-ci.yml file
We do not need to install GCC for w64-mingw32 jobs
This commit is contained in:
parent
903792f109
commit
008efa9b0e
1 changed files with 4 additions and 4 deletions
|
@ -52,7 +52,7 @@ stages: # List of stages for jobs, and their order of execution
|
|||
- dpkg --add-architecture arm64
|
||||
- apt-get update
|
||||
- *aptcache
|
||||
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes make git ccache gcc
|
||||
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes make git ccache
|
||||
- *ccache
|
||||
- ccache --zero-stats || true
|
||||
- ccache --show-stats || true
|
||||
|
@ -70,7 +70,7 @@ build-i686-linux-gnu:
|
|||
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
|
||||
script:
|
||||
- *aptcache
|
||||
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-i686-linux-gnu || true
|
||||
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-i686-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
|
||||
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
|
||||
- export CC=i686-linux-gnu-gcc
|
||||
- export OBJCOPY=i686-linux-gnu-objcopy
|
||||
|
@ -87,7 +87,7 @@ build-aarch64-linux-gnu:
|
|||
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
|
||||
script:
|
||||
- *aptcache
|
||||
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-aarch64-linux-gnu || true
|
||||
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-aarch64-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
|
||||
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
|
||||
- export CC=aarch64-linux-gnu-gcc
|
||||
- export OBJCOPY=aarch64-linux-gnu-objcopy
|
||||
|
@ -104,7 +104,7 @@ build-x86_64-linux-gnu:
|
|||
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
|
||||
script:
|
||||
- *aptcache
|
||||
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-x86-64-linux-gnu || true
|
||||
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc-x86-64-linux-gnu || apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes gcc
|
||||
- apt-get --option dir::cache::archives="$APT_CACHE_DIR" install --no-install-recommends --yes libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
|
||||
- export CC=x86_64-linux-gnu-gcc
|
||||
- export OBJCOPY=x86_64-linux-gnu-objcopy
|
||||
|
|
Loading…
Reference in a new issue