From 6a942a397154942690e3ac2300f98e36369dfce2 Mon Sep 17 00:00:00 2001 From: naturecodevoid <44983869+naturecodevoid@users.noreply.github.com> Date: Mon, 29 May 2023 18:08:47 -0700 Subject: [PATCH] feat: enable unstable features on nightly and PR builds --- .github/workflows/nightly.yml | 3 +++ .github/workflows/pr.yml | 3 +++ Build.xcconfig | 5 ++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6091dbff..9b332aa2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -39,6 +39,9 @@ jobs: - name: Change default icon to nightly icon run: sed -e 's/= Neon/= Steel/' -i '' ./AltStore.xcodeproj/project.pbxproj + - name: Enable unstable features + run: echo '\nSWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) UNSTABLE' >> ./Build.xcconfig + - name: Get version id: version run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6b2b7251..2ab23dfc 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -30,6 +30,9 @@ jobs: - name: Change default icon to alpha icon run: sed -e 's/= Neon/= Storm/' -i '' ./AltStore.xcodeproj/project.pbxproj + - name: Enable unstable features + run: echo '\nSWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) UNSTABLE' >> ./Build.xcconfig + - name: Get version id: version run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT diff --git a/Build.xcconfig b/Build.xcconfig index c3cbb3a5..4a5cdc16 100644 --- a/Build.xcconfig +++ b/Build.xcconfig @@ -1,5 +1,5 @@ // Configuration settings file format documentation can be found at: -// https://help.apple.com/xcode/#/dev745c5c974 +// https://developer.apple.com/documentation/xcode/adding-a-build-configuration-file-to-your-project/ MARKETING_VERSION = 0.3.2 CURRENT_PROJECT_VERSION = 3050 @@ -16,9 +16,8 @@ ORG_IDENTIFIER = com.SideStore ORG_PREFIX = $(ORG_IDENTIFIER) PRODUCT_NAME = SideStore -//PRODUCT_NAME[configuration=Debug] = Prov Debug -PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).SideStore +PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).$(PRODUCT_NAME) // add team ID to bundle ID for debug builds since these will most likely be installed via Xcode // SideStore will expect the team ID to be at the end of the bundle ID, but this doesn't happen when we install via Xcode // we don't want to do this for release since those builds will most likely be installed via SideServer, which adds the team ID