From b377cc7415a5463b0bcc6ee72febbdd477fc0674 Mon Sep 17 00:00:00 2001 From: Yoshi Sugawara Date: Sun, 7 Mar 2021 09:03:55 -1000 Subject: [PATCH] Add new build job for macOS using xcodebuild; Added xcconfig to specify libretro development team --- .gitlab-ci.yml | 16 ++++++++++++++++ pkg/apple/GitLabCI.xcconfig | 12 ++++++++++++ .../RetroArch_Metal.xcodeproj/project.pbxproj | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkg/apple/GitLabCI.xcconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15cb0ec202..71300da80f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -457,6 +457,22 @@ build-retroarch-osx-arm64-metal: - tar -czf RetroArch.tar.gz RetroArch.app - rm -rf RetroArch.app +# Mac OS Universal, Metal +build-retroarch-osx-universal-metal: + tags: + - macosx + stage: build + variables: + XCARCHIVE_PATH=/pkg/apple/build/RetroArch + artifacts: + paths: + - RetroArch.zip + expire_in: 10 min + dependencies: [] + script: + - xcodebuild -project pkg/apple/RetroArch_Metal.xcodeproj -config Release -scheme RetroArch -archivePath ${XCARCHIVE_PATH} -xcconfig pkg/apple/GitLabCI.xcconfig archive + - zip -qr RetroArch.zip ${XCARCHIVE_PATH}.xcarchive/Products/Users/gitlab/Applications/RetroArch.app + build-retroarch-dingux-mips32: image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-dingux:latest stage: build diff --git a/pkg/apple/GitLabCI.xcconfig b/pkg/apple/GitLabCI.xcconfig new file mode 100644 index 0000000000..f1d3ee09f6 --- /dev/null +++ b/pkg/apple/GitLabCI.xcconfig @@ -0,0 +1,12 @@ +// +// GitLabCI.xcconfig +// RetroArch_Metal +// +// Created by Yoshi Sugawara on 3/7/21. +// + +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 + +#include "Metal.xcconfig" +DEVELOPMENT_TEAM=ZE9XE938Z2 diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj index 21519203f2..3074689002 100644 --- a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj @@ -531,6 +531,7 @@ 84DD5EB41A89E737007336C1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = ../../../../../../System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; 84DD5EB71A89F1C7007336C1 /* retroarch.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = retroarch.icns; path = ../../media/retroarch.icns; sourceTree = ""; }; 8D1107320486CEB800E47090 /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 9254B2E625F5516A00A1E0DA /* GitLabCI.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = GitLabCI.xcconfig; sourceTree = ""; }; A902040DE66D42F9EE47BFE3 /* MenuDisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuDisplay.h; sourceTree = ""; }; A90205FD4D5979BD8B7E4DD6 /* Info_Metal.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.info; name = Info_Metal.plist; path = OSX/Info_Metal.plist; sourceTree = ""; }; A902065A41AEBECE594908C7 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = OSX/en.lproj/MainMenu_Metal.xib; sourceTree = ""; }; @@ -1414,6 +1415,7 @@ 05422E5C2140CFC500F09961 /* Metal.xcconfig */, A90207489289602F593626D5 /* QTConfig.xcconfig */, 05422E5B2140CE3500F09961 /* VulkanConfig.xcconfig */, + 9254B2E625F5516A00A1E0DA /* GitLabCI.xcconfig */, 840222FA1A889EA2009AB261 /* Core */, 05A8C51920DB72C200FF7857 /* Sources */, 841CBB821A8A33810066E9F1 /* Assets */,