Skip to content

libretro: fix chars in CI and use updated docker for linux aarch64 #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cscd98 wants to merge 1 commit into from
Closed

libretro: fix chars in CI and use updated docker for linux aarch64 #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# DESCRIPTION: GitLab CI/CD for libRetro (NOT FOR GitLab-proper)


##############################################################################
################################# BOILERPLATE ################################
##############################################################################


# Core definitions
.core-defs:
variables:
GIT_SUBMODULE_STRATEGY: normal
CORENAME: dirksimple
CORE_ARGS: -DLIBRETRO=ON


# Inclusion templates, required for the build to work
include:
################################## DESKTOPS ################################
Expand All @@ -29,7 +29,7 @@ include:
# MacOS
- project: 'libretro-infrastructure/ci-templates'
file: 'osx-cmake-x86.yml'


################################## CELLULAR ################################
# Android
- project: 'libretro-infrastructure/ci-templates'
Expand Down Expand Up @@ -58,7 +58,7 @@ stages:
- build-prepare
- build-shared
- build-static


##############################################################################
#################################### STAGES ##################################
##############################################################################
Expand All @@ -69,25 +69,29 @@ libretro-build-linux-x64:
extends:
- .libretro-linux-cmake-x86_64
- .core-defs


# Linux ARM 64-bit
libretro-build-linux-aarch64:
extends:
- .libretro-linux-cmake-aarch64
- .core-defs

image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:backports
variables:
CC: /usr/bin/gcc-14
CXX: /usr/bin/g++-14

# Linux 32-bit
libretro-build-linux-i686:
extends:
- .libretro-linux-cmake-x86
- .core-defs


# Windows 64-bit
libretro-build-windows-x64:
extends:
- .libretro-windows-cmake-x86_64
- .core-defs


# Windows 32-bit
libretro-build-windows-i686:
extends:
Expand All @@ -105,26 +109,26 @@ libretro-build-osx-arm64:
extends:
- .libretro-osx-cmake-arm64
- .core-defs


################################### CELLULAR #################################
# Android ARMv7a
android-armeabi-v7a:
extends:
- .libretro-android-cmake-armeabi-v7a
- .core-defs


# Android ARMv8a
android-arm64-v8a:
extends:
- .libretro-android-cmake-arm64-v8a
- .core-defs


# Android 64-bit x86
android-x86_64:
extends:
- .libretro-android-cmake-x86_64
- .core-defs


# Android 32-bit x86
android-x86:
extends:
Expand Down
Loading