Update .gitlab-ci.yml (#805)
This commit is contained in:
@@ -54,15 +54,7 @@ stages:
|
|||||||
################################### DESKTOPS #################################
|
################################### DESKTOPS #################################
|
||||||
# Linux 64-bit
|
# Linux 64-bit
|
||||||
libretro-build-linux-x64:
|
libretro-build-linux-x64:
|
||||||
image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:latest
|
image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:backports
|
||||||
before_script:
|
|
||||||
- export NUMPROC=$(($(nproc)/5))
|
|
||||||
- sudo apt-get update -qy
|
|
||||||
- sudo apt-get install -qy software-properties-common
|
|
||||||
- sudo add-apt-repository -y ppa:savoury1/build-tools
|
|
||||||
- sudo add-apt-repository -y ppa:savoury1/gcc-defaults-12
|
|
||||||
- sudo apt-get update -qy
|
|
||||||
- sudo apt-get install -qy cmake gcc-12 g++-12
|
|
||||||
variables:
|
variables:
|
||||||
CC: /usr/bin/gcc-12
|
CC: /usr/bin/gcc-12
|
||||||
CXX: /usr/bin/g++-12
|
CXX: /usr/bin/g++-12
|
||||||
@@ -106,13 +98,9 @@ android-arm64-v8a:
|
|||||||
extends:
|
extends:
|
||||||
- .libretro-android-cmake-arm64-v8a
|
- .libretro-android-cmake-arm64-v8a
|
||||||
- .core-defs
|
- .core-defs
|
||||||
before_script:
|
variables:
|
||||||
- export NUMPROC=$(($(nproc)/5))
|
ANDROID_NDK_VERSION: 26.2.11394342
|
||||||
- export ANDROID_NDK_VERSION=26.2.11394342
|
NDK_ROOT: /android-sdk-linux/ndk/$ANDROID_NDK_VERSION
|
||||||
- export NDK_ROOT=/android-sdk-linux/ndk/$ANDROID_NDK_VERSION
|
|
||||||
- /android-sdk-linux/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION"
|
|
||||||
- /android-sdk-linux/cmdline-tools/latest/bin/sdkmanager "cmake;3.30.3"
|
|
||||||
- export PATH=/android-sdk-linux/cmake/3.30.3/bin:$PATH
|
|
||||||
|
|
||||||
# Android 64-bit x86
|
# Android 64-bit x86
|
||||||
# android-x86_64:
|
# android-x86_64:
|
||||||
|
|||||||
Reference in New Issue
Block a user