FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modify how secrets are inserted into the build process

Browse Source
This commit is contained in:
Maurice Parker 2019-09-24 08:41:00 -05:00
parent 59b0206e23
commit 2c095e6dfe
4 changed files with 64 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
NetNewsWire.xcodeproj/project.pbxproj
View File

@ -2156,7 +2156,9 @@
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 840D61A32029031E009BC708 /* Build configuration list for PBXNativeTarget "NetNewsWire-iOS" */; buildConfigurationList = 840D61A32029031E009BC708 /* Build configuration list for PBXNativeTarget "NetNewsWire-iOS" */;
buildPhases = ( buildPhases = (
517D2D80233A46ED00FF3E35 /* Update ArticleExtractorConfig.swift */,
840D61782029031C009BC708 /* Sources */, 840D61782029031C009BC708 /* Sources */,
517D2D81233A47AD00FF3E35 /* Reset ArticleExtractorConfig.swift */,
840D61792029031C009BC708 /* Frameworks */, 840D61792029031C009BC708 /* Frameworks */,
840D617A2029031C009BC708 /* Resources */, 840D617A2029031C009BC708 /* Resources */,
51C451DF2264C7F200C03939 /* Embed Frameworks */, 51C451DF2264C7F200C03939 /* Embed Frameworks */,
@ -2186,8 +2188,9 @@
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 849C647A1ED37A5D003D8FC0 /* Build configuration list for PBXNativeTarget "NetNewsWire" */; buildConfigurationList = 849C647A1ED37A5D003D8FC0 /* Build configuration list for PBXNativeTarget "NetNewsWire" */;
buildPhases = ( buildPhases = (
51D6803823330CFF0097A009 /* Update Feedbin Mercury API Keys */, 51D6803823330CFF0097A009 /* Update ArticleExtractorConfig.swift */,
849C645C1ED37A5D003D8FC0 /* Sources */, 849C645C1ED37A5D003D8FC0 /* Sources */,
517D2D82233A53D600FF3E35 /* Reset ArticleExtractorConfig.swift */,
849C645D1ED37A5D003D8FC0 /* Frameworks */, 849C645D1ED37A5D003D8FC0 /* Frameworks */,
849C645E1ED37A5D003D8FC0 /* Resources */, 849C645E1ED37A5D003D8FC0 /* Resources */,
84C987A52000AC9E0066B150 /* Run Script: Automated build numbers */, 84C987A52000AC9E0066B150 /* Run Script: Automated build numbers */,
@ -2597,7 +2600,7 @@
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "xcrun -sdk macosx swiftc -target x86_64-macosx10.11 buildscripts/VerifyNoBuildSettings.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n"; shellScript = "xcrun -sdk macosx swiftc -target x86_64-macosx10.11 buildscripts/VerifyNoBuildSettings.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n";
}; };
51D6803823330CFF0097A009 /* Update Feedbin Mercury API Keys */ = { 517D2D80233A46ED00FF3E35 /* Update ArticleExtractorConfig.swift */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
@ -2606,14 +2609,68 @@
); );
inputPaths = ( inputPaths = (
); );
name = "Update Feedbin Mercury API Keys"; name = "Update ArticleExtractorConfig.swift";
outputFileListPaths = ( outputFileListPaths = (
); );
outputPaths = ( outputPaths = (
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "FAILED=false\n\nif [ \"${CONFIGURATION}\" = \"Debug\" ]; then\necho \"Not a release build. ArticleExtractorConfig.swift not changed.\"\nexit 0\nfi\n\nif [ -z \"${MERCURY_CLIENT_ID}\" ]; then\necho \"${SRCROOT}/Shared/Article Extractor/ArticleExtractorConfig.swift:21:1: warning: Missing Feedbin Mercury Client ID\"\nFAILED=true\nfi\n\nif [ -z \"${MERCURY_CLIENT_SECRET}\" ]; then\necho \"${SRCROOT}/Shared/Article Extractor/ArticleExtractorConfig.swift:22:1: warning: Missing Feedbin Mercury Client Secret\"\nFAILED=true\nfi\n\nsed -i .tmp \"s|{MERCURYID}|${MERCURY_CLIENT_ID}|g; s|{MERCURYSECRET}|${MERCURY_CLIENT_SECRET}|g\" \"${SRCROOT}/Shared/Article Extractor/ArticleExtractorConfig.swift\"\n\nrm -f \"${SRCROOT}/Shared/Article Extractor/ArticleExtractorConfig.swift.tmp\"\n\nif [ \"$FAILED\" = true ]; then\nexit 1\nfi\n\necho \"All env values found!\"\n"; shellScript = "FAILED=false\n\nif [ -z \"${MERCURY_CLIENT_ID}\" ]; then\nFAILED=true\nfi\n\nif [ -z \"${MERCURY_CLIENT_SECRET}\" ]; then\nFAILED=true\nfi\n\nif [ \"$FAILED\" = true ]; then\necho \"Missing Feedbin Mercury credetials. ArticleExtractorConfig.swift not changed.\"\nexit 0\nfi\n\nsed -i .tmp \"s|{MERCURYID}|${MERCURY_CLIENT_ID}|g; s|{MERCURYSECRET}|${MERCURY_CLIENT_SECRET}|g\" \"${SRCROOT}/Shared/Article Extractor/ArticleExtractorConfig.swift\"\n\nrm -f \"${SRCROOT}/Shared/Article Extractor/ArticleExtractorConfig.swift.tmp\"\n\necho \"All env values found!\"\n";
};
517D2D81233A47AD00FF3E35 /* Reset ArticleExtractorConfig.swift */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Reset ArticleExtractorConfig.swift";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "git checkout \"${SRCROOT}/Shared/Article Extractor/ArticleExtractorConfig.swift\"\n";
};
517D2D82233A53D600FF3E35 /* Reset ArticleExtractorConfig.swift */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Reset ArticleExtractorConfig.swift";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "git checkout \"${SRCROOT}/Shared/Article Extractor/ArticleExtractorConfig.swift\"\n";
};
51D6803823330CFF0097A009 /* Update ArticleExtractorConfig.swift */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Update ArticleExtractorConfig.swift";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "FAILED=false\n\nif [ -z \"${MERCURY_CLIENT_ID}\" ]; then\nFAILED=true\nfi\n\nif [ -z \"${MERCURY_CLIENT_SECRET}\" ]; then\nFAILED=true\nfi\n\nif [ \"$FAILED\" = true ]; then\necho \"Missing Feedbin Mercury credetials. ArticleExtractorConfig.swift not changed.\"\nexit 0\nfi\n\nsed -i .tmp \"s|{MERCURYID}|${MERCURY_CLIENT_ID}|g; s|{MERCURYSECRET}|${MERCURY_CLIENT_SECRET}|g\" \"${SRCROOT}/Shared/Article Extractor/ArticleExtractorConfig.swift\"\n\nrm -f \"${SRCROOT}/Shared/Article Extractor/ArticleExtractorConfig.swift.tmp\"\n\necho \"All env values found!\"\n\n";
}; };
8423E3E3220158E700C3795B /* Run Script: codesign release builds */ = { 8423E3E3220158E700C3795B /* Run Script: codesign release builds */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;

1
xcconfig/NetNewsWire_iOSapp_target.xcconfig
View File

@ -30,6 +30,7 @@ PROVISIONING_PROFILE_SPECIFIER =
// /Users/Shared/git/SharedXcodeSettings/DeveloperSettings.xcconfig // /Users/Shared/git/SharedXcodeSettings/DeveloperSettings.xcconfig
// //
#include? "../../SharedXcodeSettings/ProjectSettings.xcconfig"
#include? "../../SharedXcodeSettings/DeveloperSettings.xcconfig" #include? "../../SharedXcodeSettings/DeveloperSettings.xcconfig"
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES

2
xcconfig/NetNewsWire_project.xcconfig
View File

@ -1,3 +1,5 @@
#include? "../../SharedXcodeSettings/ProjectSettings.xcconfig"
ALWAYS_SEARCH_USER_PATHS = NO ALWAYS_SEARCH_USER_PATHS = NO
CLANG_ANALYZER_NONNULL = YES CLANG_ANALYZER_NONNULL = YES
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

1
xcconfig/NetNewsWire_project_release.xcconfig
View File

@ -1,4 +1,3 @@
#include? "../../SharedXcodeSettings/ReleaseSettings.xcconfig"
#include "./NetNewsWire_project.xcconfig" #include "./NetNewsWire_project.xcconfig"
COPY_PHASE_STRIP = NO COPY_PHASE_STRIP = NO