From cd75d17f3ad1bf8ddf4234257870e15fe793a76b Mon Sep 17 00:00:00 2001
From: Max Goedjen <max.goedjen@gmail.com>
Date: Sun, 15 Mar 2020 16:40:07 -0700
Subject: [PATCH] Signing changes
---
.github/workflows/release.yml | 7 +++++++
.github/workflows/test.yml | 9 ++++++++-
Secretive.xcodeproj/project.pbxproj | 20 ++++++++-----------
.../xcschemes/SecretAgent.xcscheme | 10 ++++++++--
.../xcschemes/SecretAgentKit.xcscheme | 2 +-
.../xcshareddata/xcschemes/SecretKit.xcscheme | 2 +-
6 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index be8cdff..4fa736b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,6 +10,13 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v1
+ - name: Setup Signing
+ env:
+ SIGNING_DATA: ${{ secrets.SIGNING_DATA }}
+ SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+ HOST_PROFILE_DATA: ${{ secrets.HOST_PROFILE_DATA }}
+ AGENT_PROFILE_DATA: ${{ secrets.AGENT_PROFILE_DATA }}
+ run: ./.github/scripts/signing.sh
- name: Test
run: xcrun xcodebuild test -project Secretive.xcodeproj -scheme Secretive
build:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 162fec8..3c08203 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,5 +7,12 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v1
+ - name: Setup Signing
+ env:
+ SIGNING_DATA: ${{ secrets.SIGNING_DATA }}
+ SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+ HOST_PROFILE_DATA: ${{ secrets.HOST_PROFILE_DATA }}
+ AGENT_PROFILE_DATA: ${{ secrets.AGENT_PROFILE_DATA }}
+ run: ./.github/scripts/signing.sh
- name: Test
- run: xcrun xcodebuild test -project Secretive.xcodeproj -scheme Secretive
\ No newline at end of file
+ run: xcrun xcodebuild test -project Secretive.xcodeproj -scheme Secretive
diff --git a/Secretive.xcodeproj/project.pbxproj b/Secretive.xcodeproj/project.pbxproj
index cb0a61a..58da3df 100644
--- a/Secretive.xcodeproj/project.pbxproj
+++ b/Secretive.xcodeproj/project.pbxproj
@@ -679,7 +679,6 @@
};
50617DAF23FCE4AB0099B055 = {
CreatedOnToolsVersion = 11.3;
- TestTargetID = 50617D7E23FCE48D0099B055;
};
5099A06B240242BA0062B6F2 = {
CreatedOnToolsVersion = 11.4;
@@ -687,7 +686,6 @@
};
5099A073240242BA0062B6F2 = {
CreatedOnToolsVersion = 11.4;
- TestTargetID = 50617D7E23FCE48D0099B055;
};
50A3B78924026B7500D209EA = {
CreatedOnToolsVersion = 11.4;
@@ -1205,7 +1203,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.SecretKitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
- TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Secretive.app/Contents/MacOS/Secretive";
};
name = Debug;
};
@@ -1225,7 +1222,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.SecretKitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
- TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Secretive.app/Contents/MacOS/Secretive";
};
name = Release;
};
@@ -1296,7 +1292,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Secretive/Secretive.entitlements;
- CODE_SIGN_IDENTITY = "-";
+ CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
@@ -1313,7 +1309,7 @@
MARKETING_VERSION = 1;
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.Host;
PRODUCT_NAME = "$(TARGET_NAME)";
- PROVISIONING_PROFILE_SPECIFIER = "";
+ PROVISIONING_PROFILE_SPECIFIER = "Secretive - Host";
SWIFT_VERSION = 5.0;
};
name = Test;
@@ -1323,6 +1319,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
+ CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = Z72PRUAWF6;
@@ -1345,8 +1342,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = SecretAgent/SecretAgent.entitlements;
- CODE_SIGN_IDENTITY = "-";
- CODE_SIGN_STYLE = Automatic;
+ CODE_SIGN_IDENTITY = "Developer ID Application";
+ CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_ASSET_PATHS = "\"SecretAgent/Preview Content\"";
DEVELOPMENT_TEAM = Z72PRUAWF6;
@@ -1361,6 +1358,7 @@
MARKETING_VERSION = 1;
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.SecretAgent;
PRODUCT_NAME = "$(TARGET_NAME)";
+ PROVISIONING_PROFILE_SPECIFIER = "Secretive - Secret Agent";
SWIFT_VERSION = 5.0;
};
name = Test;
@@ -1399,6 +1397,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+ CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = Z72PRUAWF6;
@@ -1411,7 +1410,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.SecretKitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
- TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Secretive.app/Contents/MacOS/Secretive";
};
name = Test;
};
@@ -1449,6 +1447,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+ CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = Z72PRUAWF6;
INFOPLIST_FILE = SecretAgentKitTests/Info.plist;
@@ -1460,7 +1459,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.SecretAgentKitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
- TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Secretive.app/Contents/MacOS/Secretive";
};
name = Test;
};
@@ -1538,7 +1536,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.SecretAgentKitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
- TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Secretive.app/Contents/MacOS/Secretive";
};
name = Debug;
};
@@ -1557,7 +1554,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.SecretAgentKitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
- TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Secretive.app/Contents/MacOS/Secretive";
};
name = Release;
};
diff --git a/Secretive.xcodeproj/xcshareddata/xcschemes/SecretAgent.xcscheme b/Secretive.xcodeproj/xcshareddata/xcschemes/SecretAgent.xcscheme
index d02d322..e425e9c 100644
--- a/Secretive.xcodeproj/xcshareddata/xcschemes/SecretAgent.xcscheme
+++ b/Secretive.xcodeproj/xcshareddata/xcschemes/SecretAgent.xcscheme
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
- version = "1.3">
+ version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -23,10 +23,16 @@
</BuildActionEntries>
</BuildAction>
<TestAction
- buildConfiguration = "Debug"
+ buildConfiguration = "Test"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:Config/Secretive.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ </TestPlans>
<Testables>
<TestableReference
skipped = "NO">
diff --git a/Secretive.xcodeproj/xcshareddata/xcschemes/SecretAgentKit.xcscheme b/Secretive.xcodeproj/xcshareddata/xcschemes/SecretAgentKit.xcscheme
index 9542d6b..2b77bef 100644
--- a/Secretive.xcodeproj/xcshareddata/xcschemes/SecretAgentKit.xcscheme
+++ b/Secretive.xcodeproj/xcshareddata/xcschemes/SecretAgentKit.xcscheme
@@ -23,7 +23,7 @@
</BuildActionEntries>
</BuildAction>
<TestAction
- buildConfiguration = "Debug"
+ buildConfiguration = "Test"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
diff --git a/Secretive.xcodeproj/xcshareddata/xcschemes/SecretKit.xcscheme b/Secretive.xcodeproj/xcshareddata/xcschemes/SecretKit.xcscheme
index bb3fbb1..77c8c59 100644
--- a/Secretive.xcodeproj/xcshareddata/xcschemes/SecretKit.xcscheme
+++ b/Secretive.xcodeproj/xcshareddata/xcschemes/SecretKit.xcscheme
@@ -23,7 +23,7 @@
</BuildActionEntries>
</BuildAction>
<TestAction
- buildConfiguration = "Debug"
+ buildConfiguration = "Test"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">