libretro: Update gitlab ci extends ordering

This commit is contained in:
Aaron Kling 2020-12-01 23:50:32 -06:00
parent 26e9a6e3d9
commit aaa61676f4
1 changed files with 9 additions and 20 deletions

View File

@ -2,6 +2,7 @@
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
JNI_PATH: src/libretro JNI_PATH: src/libretro
MAKEFILE_PATH: src/libretro
CORENAME: vbam CORENAME: vbam
include: include:
@ -26,54 +27,42 @@ stages:
#Desktop #Desktop
libretro-build-linux-x64: libretro-build-linux-x64:
extends: extends:
- .core-defs
- .libretro-linux-x64-make-default - .libretro-linux-x64-make-default
variables: - .core-defs
MAKEFILE_PATH: src/libretro
MAKEFILE: Makefile
libretro-build-windows-x64: libretro-build-windows-x64:
extends: extends:
- .core-defs
- .libretro-windows-x64-mingw-make-default - .libretro-windows-x64-mingw-make-default
variables: - .core-defs
MAKEFILE_PATH: src/libretro
MAKEFILE: Makefile
# Android # Android
android-armeabi-v7a: android-armeabi-v7a:
extends: extends:
- .core-defs
- .libretro-android-jni-armeabi-v7a - .libretro-android-jni-armeabi-v7a
- .core-defs
android-arm64-v8a: android-arm64-v8a:
extends: extends:
- .core-defs
- .libretro-android-jni-arm64-v8a - .libretro-android-jni-arm64-v8a
- .core-defs
android-x86_64: android-x86_64:
extends: extends:
- .core-defs
- .libretro-android-jni-x86_64 - .libretro-android-jni-x86_64
- .core-defs
android-x86: android-x86:
extends: extends:
- .core-defs
- .libretro-android-jni-x86 - .libretro-android-jni-x86
- .core-defs
# Static # Static
libretro-build-libnx-aarch64: libretro-build-libnx-aarch64:
extends: extends:
- .core-defs
- .libretro-libnx-static-retroarch-master - .libretro-libnx-static-retroarch-master
variables: - .core-defs
MAKEFILE_PATH: src/libretro
MAKEFILE: Makefile
libretro-build-vita: libretro-build-vita:
extends: extends:
- .core-defs
- .libretro-vita-static-retroarch-master - .libretro-vita-static-retroarch-master
variables: - .core-defs
MAKEFILE_PATH: src/libretro
MAKEFILE: Makefile