diff options
| author | neonloop | 2021-04-03 16:57:56 +0000 |
|---|---|---|
| committer | neonloop | 2021-04-03 16:57:56 +0000 |
| commit | f81b441134306c96c0c06fa0cce77d1f78c274e4 (patch) | |
| tree | e728393188f4f0fe65338d1f7df6c6bdde0288d3 /.gitlab-ci.yml | |
| parent | 0688325a887ddfc24f5904204a4635af66d85444 (diff) | |
| parent | 3993490baa28964c5e3e8f879b58147184d9b0f7 (diff) | |
| download | pcsx_rearmed-f81b441134306c96c0c06fa0cce77d1f78c274e4.tar.gz pcsx_rearmed-f81b441134306c96c0c06fa0cce77d1f78c274e4.tar.bz2 pcsx_rearmed-f81b441134306c96c0c06fa0cce77d1f78c274e4.zip | |
Merge remote-tracking branch 'libretro/master' into trimui-s
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3706fc..bf05cac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,10 +34,22 @@ include: - project: 'libretro-infrastructure/ci-templates' file: '/osx-x64.yml' + # MacOS ARM 64-bit + - project: 'libretro-infrastructure/ci-templates' + file: '/osx-arm64.yml' + ################################## CELLULAR ################################ # Android - project: 'libretro-infrastructure/ci-templates' file: '/android-jni.yml' + + # iOS + - project: 'libretro-infrastructure/ci-templates' + file: '/ios-arm64.yml' + + # iOS (armv7) + - project: 'libretro-infrastructure/ci-templates' + file: '/ios9.yml' ################################## CONSOLES ################################ # PlayStation Portable @@ -56,6 +68,12 @@ include: - project: 'libretro-infrastructure/ci-templates' file: '/libnx-static.yml' + # tvOS (AppleTV) + - project: 'libretro-infrastructure/ci-templates' + file: '/tvos-arm64.yml' + + #################################### MISC ################################## + # Stages for building stages: - build-prepare @@ -97,6 +115,12 @@ libretro-build-osx-x64: - .libretro-osx-x64-make-default - .core-defs +# MacOS ARM 64-bit +libretro-build-osx-arm64: + extends: + - .libretro-osx-arm64-make-default + - .core-defs + ################################### CELLULAR ################################# # Android ARMv7a android-armeabi-v7a: @@ -121,6 +145,24 @@ android-x86: extends: - .libretro-android-jni-x86 - .core-defs + +# iOS +libretro-build-ios-arm64: + extends: + - .libretro-ios-arm64-make-default + - .core-defs + +# iOS (armv7) [iOS 9 and up] +libretro-build-ios9: + extends: + - .libretro-ios9-make-default + - .core-defs + +# tvOS +libretro-build-tvos-arm64: + extends: + - .libretro-tvos-arm64-make-default + - .core-defs ################################### CONSOLES ################################# # PlayStation Vita |