From 1b3c9e62aaaac82f7dd565185c709b5574d7e069 Mon Sep 17 00:00:00 2001 From: warmenhoven Date: Wed, 22 Mar 2023 02:43:00 -0400 Subject: [PATCH] Use same Xcode project for iOS as is used for packaging (take 2) (#15118) --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2761903125..3ad8c3e8a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -387,16 +387,19 @@ build-retroarch-osx-opengl-x64: build-retroarch-ios-arm64: extends: .build-retroarch-macos-xcode + tags: + - mac-apple-silicon variables: - XCPROJECT_NAME: RetroArch_iOS11_Metal + XCPROJECT_NAME: RetroArch_iOS13 XCCONFIG: GitLabCI.xcconfig XCSCHEME: "RetroArch iOS Release" + XCDESTINATION: "generic/platform=iOS" artifacts: paths: - retroarch-repo/ expire_in: 10 min script: - - xcodebuild -project pkg/apple/${XCPROJECT_NAME}.xcodeproj -config Release -scheme "${XCSCHEME}" -xcconfig pkg/apple/iOS/GitLabCI.xcconfig build + - xcodebuild -project pkg/apple/${XCPROJECT_NAME}.xcodeproj -destination ${XCDESTINATION} -config Release -scheme "${XCSCHEME}" -xcconfig pkg/apple/iOS/${XCCONFIG} build - mkdir .retroarch-repo - "cp -r ./* .retroarch-repo" - "mv .retroarch-repo/ retroarch-repo/" @@ -421,6 +424,7 @@ build-retroarch-tvos-arm64: extends: build-retroarch-ios-arm64 variables: XCSCHEME: "RetroArch tvOS Release" + XCDESTINATION: "generic/platform=tvOS" build-retroarch-dingux-mips32: image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-dingux:latest