From ecb28513732c61b690ebb004c6e4b1d0aa905b39 Mon Sep 17 00:00:00 2001 From: James Dempsey Date: Wed, 6 Mar 2024 17:59:23 -0800 Subject: [PATCH 1/5] Test a new location for writing files --- ci_scripts/ci_post_clone.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index 094734a..bdb8fc5 100755 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -9,7 +9,7 @@ if [ $CI_XCODE_CLOUD = "TRUE" ]; then # Get path to xcconfig files in project -configFolderPath = "$CI_PRIMARY_REPOSITORY_PATH/Config" +configFolderPath="$CI_WORKSPACE/Shared" # Write private project configuration file privateProjectConfigPath="$configFolderPath/PrivateProjectConfig.xcconfig" From 0a303b7ed250e55c68e3273450fdb957490b4664 Mon Sep 17 00:00:00 2001 From: James Dempsey Date: Wed, 6 Mar 2024 18:09:48 -0800 Subject: [PATCH 2/5] Try another path --- ci_scripts/ci_post_clone.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index bdb8fc5..fdca2ee 100755 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -9,7 +9,9 @@ if [ $CI_XCODE_CLOUD = "TRUE" ]; then # Get path to xcconfig files in project -configFolderPath="$CI_WORKSPACE/Shared" +configFolderPath="$CI_WORKSPACE_PATH/Shared" + +echo $configFolderPath # Write private project configuration file privateProjectConfigPath="$configFolderPath/PrivateProjectConfig.xcconfig" From 32f82ff2f1aaca0d8428604d3a208ea462a7ec05 Mon Sep 17 00:00:00 2001 From: James Dempsey Date: Wed, 6 Mar 2024 18:12:57 -0800 Subject: [PATCH 3/5] Another location --- ci_scripts/ci_post_clone.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index fdca2ee..e7ea555 100755 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -9,7 +9,7 @@ if [ $CI_XCODE_CLOUD = "TRUE" ]; then # Get path to xcconfig files in project -configFolderPath="$CI_WORKSPACE_PATH/Shared" +configFolderPath="/Users/Shared" echo $configFolderPath From 6438e8d1fa7da81104d6b3acbb086d6e2394b6f1 Mon Sep 17 00:00:00 2001 From: James Dempsey Date: Wed, 6 Mar 2024 18:17:45 -0800 Subject: [PATCH 4/5] Attempt write into /Users/Shared --- Config/AppConfig.xcconfig | 4 +++- Config/ProjectConfig.xcconfig | 2 ++ ci_scripts/ci_post_clone.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Config/AppConfig.xcconfig b/Config/AppConfig.xcconfig index 09503b6..5404a49 100644 --- a/Config/AppConfig.xcconfig +++ b/Config/AppConfig.xcconfig @@ -21,6 +21,8 @@ PRODUCT_BUNDLE_IDENTIFIER = net.tapas-software.${PRODUCT_NAME:rfc1034identifier} // Allows private app config info to be set and overridden for local dev builds #include? "/Users/Shared/git/xcconfig-private/CodeSigning.xcconfig" +#include? "/Users/Shared/git/xcconfig-private/PrivateAppConfig.xcconfig" + // Allows private app config information to be set and overridden for CI builds -#include? "PrivateAppConfig.xcconfig" +//#include? "PrivateAppConfig.xcconfig" diff --git a/Config/ProjectConfig.xcconfig b/Config/ProjectConfig.xcconfig index 7a74095..f7322f7 100644 --- a/Config/ProjectConfig.xcconfig +++ b/Config/ProjectConfig.xcconfig @@ -21,6 +21,8 @@ #include? "/usr/local/etc/xcconfig-private/CodeSigning.xcconfig" #include? "/Users/Shared/git/xcconfig-private/CodeSigning.xcconfig" +#include? "/Users/Shared/git/xcconfig-private/PrivateProjectConfig.xcconfig" + // Code Sign Style diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index e7ea555..cd974ac 100755 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -9,7 +9,7 @@ if [ $CI_XCODE_CLOUD = "TRUE" ]; then # Get path to xcconfig files in project -configFolderPath="/Users/Shared" +configFolderPath="/Users/Shared/git/xcconfig-private" echo $configFolderPath From eb5fe375bbe92d19e6e94e749f0eb6f042d9ab59 Mon Sep 17 00:00:00 2001 From: James Dempsey Date: Wed, 6 Mar 2024 18:22:01 -0800 Subject: [PATCH 5/5] Use mkdir to create target directory first --- ci_scripts/ci_post_clone.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index cd974ac..67800d2 100755 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -13,6 +13,8 @@ configFolderPath="/Users/Shared/git/xcconfig-private" echo $configFolderPath +mkdir -p $configFolderPath + # Write private project configuration file privateProjectConfigPath="$configFolderPath/PrivateProjectConfig.xcconfig"