Skip to content

Commit

Permalink
Merge branch 'release/2.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeMatt committed Dec 9, 2022
2 parents 5b21e67 + 8f29b8e commit 79e00ea
Show file tree
Hide file tree
Showing 2,570 changed files with 611,976 additions and 196,753 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/attach_build_products.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Add artifact links to pull request and related issues
on:
workflow_run:
workflows: [Build and Upload Provenance]
types: [completed]

jobs:
artifacts-url-comments:
name: add artifact links to pull request and related issues job
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: add artifact links to pull request and related issues step
uses: tonyhallett/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
prefix: Builds for this Pull Request are available at
suffix: Have a nice day.
format: name
addTo: pull
# addTo: pullandissues
93 changes: 93 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
name: Build and Upload Provenance
on:
push:
branches:
- master
- develop
pull_request:
branches:
- master
- develop

env:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

jobs:
build:
name: Build and upload Provenance
strategy:
fail-fast: false
matrix:
include:
- os: 'macos-12'
version: '14.1'

runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
submodules: recursive

# - name: Install Xcode
# uses: maxim-lobanov/setup-xcode@v1
# with:
# xcode-version: ${{ matrix.version }}

- name: Setup Xcode
uses: maxim-lobanov/[email protected]
with:
xcode-version: ${{ matrix.version }}
# xcode-select-path: /Applications/Xcode_${{ matrix.version }}.app/Contents/Developer

- name: Install dependencies
run: brew install ldid

- name: Build Provenance
run: |
xcodebuild -workspace Provenance.xcworkspace -scheme Provenance-Release -sdk iphoneos archive -archivePath ./archive CODE_SIGNING_REQUIRED=NO AD_HOC_CODE_SIGNING_ALLOWED=YES CODE_SIGNING_ALLOWED=NO DEVELOPMENT_TEAM=XYZ0123456 ORG_IDENTIFIER=org.provenance-emu | xcpretty && exit ${PIPESTATUS[0]}
# - name: Build Provenance
# run: |
# rm -rf ~/Library/Developer/Xcode/DerivedData/
# rm ./Provenance.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
# rm ./Provenance.xcworkspace/xcshareddata/swiftpm/Package.resolved
# xcodebuild -workspace Provenance.xcworkspace -scheme Provenance-Release -sdk iphoneos archive -archivePath ./archive CODE_SIGNING_REQUIRED=NO AD_HOC_CODE_SIGNING_ALLOWED=YES CODE_SIGNING_ALLOWED=NO DEVELOPMENT_TEAM=XYZ0123456 ORG_IDENTIFIER=org.provenance-emu | xcpretty && exit ${PIPESTATUS[0]}

- name: Fakesign app
run: |
rm -rf archive.xcarchive/Products/Applications/Provenance.app/Frameworks/*.framework/Frameworks/
ldid -SProvenance/Provenance.entitlements archive.xcarchive/Products/Applications/Provenance.app/Provenance
- name: Convert to IPA
run: |
mkdir Payload
mkdir Payload/Provenance.app
cp -R archive.xcarchive/Products/Applications/Provenance.app/ Payload/Provenance.app/
zip -r Provenance.ipa Payload
- name: Upload Artifact
uses: actions/[email protected]
with:
name: Provenance.ipa
path: Provenance.ipa

# - name: Upload IPA to S3
# if: ${{ github.branch == 'develop' }}
# uses: ebuckthal/s3-upload-artifact@v7
# with:
# bucket: 'sh-sysops'
# key: ${AWS_SECRET_ACCESS_KEY}
# path: 'Provenance.ipa'

# - name: Upload IPA to App Center
# uses: wzieba/AppCenter-Github-Action@v1
# if: ${{ github.branch == 'develop' }}
# with:
# appName: wzieba/Sample-App
# token: ${{secrets.APP_CENTER_TOKEN}}
# group: Testers
# file: Provenance.ipa
# notifyTesters: true
# debug: false
91 changes: 91 additions & 0 deletions .github/workflows/codesee-arch-diagram.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
# This workflow was added by CodeSee. Learn more at https://codesee.io/
# This is v2.0 of this workflow file
on:
push:
branches:
- develop
pull_request_target:
types: [opened, synchronize, reopened]

name: CodeSee Map

permissions: read-all

jobs:
test_map_action:
runs-on: ubuntu-latest
continue-on-error: true
name: Run CodeSee Map Analysis
steps:
- name: checkout
id: checkout
uses: actions/checkout@v3
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
fetch-depth: 0

# codesee-detect-languages has an output with id languages.
- name: Detect Languages
id: detect-languages
uses: Codesee-io/codesee-detect-languages-action@latest

- name: Configure JDK 16
uses: actions/setup-java@v3
if: ${{ fromJSON(steps.detect-languages.outputs.languages).java }}
with:
java-version: '16'
distribution: 'zulu'

# CodeSee Maps Go support uses a static binary so there's no setup step required.

- name: Configure Node.js 16
uses: actions/setup-node@v3
if: ${{ fromJSON(steps.detect-languages.outputs.languages).javascript }}
with:
node-version: '16'

- name: Configure Python 3.x
uses: actions/setup-python@v4
if: ${{ fromJSON(steps.detect-languages.outputs.languages).python }}
with:
python-version: '3.x'
architecture: 'x64'

- name: Configure Ruby '3.x'
uses: ruby/setup-ruby@v1
if: ${{ fromJSON(steps.detect-languages.outputs.languages).ruby }}
with:
ruby-version: '3.0'

# We need the rust toolchain because it uses rustc and cargo to inspect the package
- name: Configure Rust 1.x stable
uses: actions-rs/toolchain@v1
if: ${{ fromJSON(steps.detect-languages.outputs.languages).rust }}
with:
toolchain: stable

- name: Generate Map
id: generate-map
uses: Codesee-io/codesee-map-action@latest
with:
step: map
api_token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}
github_ref: ${{ github.ref }}
languages: ${{ steps.detect-languages.outputs.languages }}

- name: Upload Map
id: upload-map
uses: Codesee-io/codesee-map-action@latest
with:
step: mapUpload
api_token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}
github_ref: ${{ github.ref }}

- name: Insights
id: insights
uses: Codesee-io/codesee-map-action@latest
with:
step: insights
api_token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}
github_ref: ${{ github.ref }}
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/rebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
- name: Automatic Rebase
uses: cirrus-actions/rebase@1.4
uses: cirrus-actions/rebase@1.7
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ report.xml
/Cores/PPSSPP/cmake/lib/Debug/libSPIRV.a
Cores/PPSSPP/cmake/lib/
/CodeSigning.xcconfig
*.xcarchive
78 changes: 72 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
[submodule "PVMupen64Plus/Plugins/mupen64plus-rsp-hle"]
path = Cores/Mupen64Plus/Plugins/rsp/hle
url = https://github.com/mupen64plus/mupen64plus-rsp-hle.git
[submodule "PVMupen64Plus/Plugins/mupen64plus-rsp-cxd4"]
path = Cores/Mupen64Plus/Plugins/rsp/cxd4
url = https://github.com/Provenance-Emu/mupen64plus-rsp-cxd4.git
[submodule "PVMupen64Plus/Plugins/mupen64plus-video-rice"]
path = Cores/Mupen64Plus/Plugins/Video/rice
url = https://github.com/Provenance-Emu/mupen64plus-video-rice.git
Expand Down Expand Up @@ -49,9 +46,6 @@
[submodule "Cores/O2EM"]
path = Cores/O2EM
url = https://github.com/Provenance-Emu/O2EM-Core.git
[submodule "Cores/VecXGL"]
path = Cores/VecXGL
url = https://github.com/Provenance-Emu/VecXGL-Core.git
[submodule "Cores/CrabEMU"]
path = Cores/CrabEMU
url = https://github.com/Provenance-Emu/CrabEmu-Core.git
Expand Down Expand Up @@ -82,3 +76,75 @@
[submodule "Cores/DosBox/dosbox-pure"]
path = Cores/DosBox/dosbox-pure
url = https://github.com/Provenance-Emu/dosbox-pure.git
[submodule "Cores/Mini_vMac/libretro-minivmac"]
path = Cores/Mini_vMac/libretro-minivmac
url = https://github.com/Provenance-Emu/libretro-minivmac.git
[submodule "Cores/BeetlePSX/beetle-psx-libretro"]
path = Cores/BeetlePSX/beetle-psx-libretro
url = https://github.com/Provenance-Emu/beetle-psx-libretro.git
[submodule "Cores/Potator/potator"]
path = Cores/Potator/potator
url = https://github.com/Provenance-Emu/potator.git
[submodule "Cores/ep128emu/ep128emu-core"]
path = Cores/ep128emu/ep128emu-core
url = https://github.com/Provenance-Emu/ep128emu-core.git
[submodule "Cores/hatari/hatari"]
path = Cores/hatari/hatari
url = https://github.com/Provenance-Emu/hatari.git
[submodule "Cores/fmsx/fmsx-libretro"]
path = Cores/fmsx/fmsx-libretro
url = https://github.com/Provenance-Emu/fmsx-libretro.git
[submodule "Cores/pcsx_rearmed/pcsx_rearmed"]
path = Cores/pcsx_rearmed/pcsx_rearmed
url = https://github.com/Provenance-Emu/pcsx_rearmed.git
[submodule "Cores/opera/opera-libretro"]
path = Cores/opera/opera-libretro
url = https://github.com/Provenance-Emu/opera-libretro.git
[submodule "Cores/Mu/Mu"]
path = Cores/Mu/Mu
url = https://github.com/Provenance-Emu/Mu.git
[submodule "Cores/Yabause/yabause"]
path = Cores/Yabause/yabause
url = https://github.com/Provenance-Emu/yabause.git
[submodule "Cores/melonDS/melonDS"]
path = Cores/melonDS/melonDS
url = https://github.com/Provenance-Emu/melonDS.git
[submodule "Cores/Mupen64Plus-NX/mupen64plus-libretro-nx"]
path = Cores/Mupen64Plus-NX/mupen64plus-libretro-nx
url = https://github.com/Provenance-Emu/mupen64plus-libretro-nx.git
[submodule "Cores/GameMusicEmu/libretro-gme"]
path = Cores/GameMusicEmu/libretro-gme
url = https://github.com/Provenance-Emu/libretro-gme.git
[submodule "Cores/VecX/libretro-vecx"]
path = Cores/VecX/libretro-vecx
url = https://github.com/Provenance-Emu/libretro-vecx.git
[submodule "Cores/Stella/Stella/stella"]
path = Cores/Stella/Stella/stella
url = https://github.com/Provenance-Emu/stella.git
[submodule "Cores/SameDuck/SameBoy"]
path = Cores/SameDuck/SameBoy
url = https://github.com/Provenance-Emu/SameBoy.git
[submodule "Cores/blueMSX/blueMSX-libretro"]
path = Cores/blueMSX/blueMSX-libretro
url = https://github.com/Provenance-Emu/blueMSX-libretro.git
[submodule "Cores/fuse/fuse-libretro"]
path = Cores/fuse/fuse-libretro
url = https://github.com/Provenance-Emu/fuse-libretro.git
[submodule "Cores/Gearcoleco/Gearcoleco"]
path = Cores/Gearcoleco/Gearcoleco
url = https://github.com/Provenance-Emu/Gearcoleco.git
[submodule "Cores/Citra/citra"]
path = Cores/Citra/citra
url = https://github.com/Provenance-Emu/citra.git
[submodule "Cores/FreeIntv/FreeIntv"]
path = Cores/FreeIntv/FreeIntv
url = https://github.com/Provenance-Emu/FreeIntv.git
[submodule "Cores/Genesis-Plus-GX/PVGenesis/Deps/Genesis-Plus-GX"]
path = Cores/Genesis-Plus-GX/PVGenesis/Deps/Genesis-Plus-GX
url = https://github.com/Provenance-Emu/Genesis-Plus-GX.git
[submodule "Cores/Mupen64Plus/Plugins/rsp/cxd4"]
path = Cores/Mupen64Plus/Plugins/rsp/cxd4
url = https://github.com/Provenance-Emu/mupen64plus-rsp-cxd4.git
[submodule "Cores/TIC80/TIC-80"]
path = Cores/TIC80/TIC-80
url = https://github.com/Provenance-Emu/TIC-80.git
3 changes: 3 additions & 0 deletions Build-iOS.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
#include "Build.xcconfig"

IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*] = 14.2
IPHONEOS_DEPLOYMENT_TARGET = 13.0
2 changes: 2 additions & 0 deletions Build-tvOS.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
#include "Build.xcconfig"

TVOS_DEPLOYMENT_TARGET = 13.0
8 changes: 6 additions & 2 deletions Build.xcconfig
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// Configuration settings file format documentation can be found at:
// https://help.apple.com/xcode/#/dev745c5c974

MARKETING_VERSION = 2.1.1
CURRENT_PROJECT_VERSION = 2781
MARKETING_VERSION = 2.2.0
CURRENT_PROJECT_VERSION = 2795

GCC_PREPROCESSOR_DEFINITIONS = $(inherited) GLES_SILENCE_DEPRECATION=1

// Vars to be overwritten by `CodeSigning.xcconfig` if exists
DEVELOPMENT_TEAM = S32Z3HMYVQ
Expand Down Expand Up @@ -38,6 +40,8 @@ TVOS_CODE_SIGN_ENTITLEMENTS_NO =
TOPSHELF_PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).$(PROJECT_NAME:lower).topshelf
SPOTLIGHT_PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).$(PROJECT_NAME:lower).spotlight

EXTENSION_PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).$(PROJECT_NAME:lower).$(PRODUCT_NAME:lower)

WATCH_PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).$(PROJECT_NAME:lower)-watch
WATCH_APP_PRODUCT_BUNDLE_IDENTIFIER = $(WATCH_PRODUCT_BUNDLE_IDENTIFIER).watchkitapp
WATCH_APP_EXTENSION_PRODUCT_BUNDLE_IDENTIFIER = $(WATCH_APP_PRODUCT_BUNDLE_IDENTIFIER).watchkitextension
Expand Down
Loading

0 comments on commit 79e00ea

Please sign in to comment.