From b420dfd8fe29bdecbbb830986378559240dbdc7b Mon Sep 17 00:00:00 2001 From: mplorentz Date: Wed, 18 Dec 2024 10:24:54 -0500 Subject: [PATCH 1/2] Update certs lane to be able to renew distribution certificate when it expires. --- CHANGELOG.md | 1 + Gemfile.lock | 24 ++++++++++++------------ fastlane/Fastfile | 7 +++---- fastlane/README.md | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5cbd127a..e24291c05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Internal Changes - Upgraded to Xcode 16. [#1570](https://github.com/planetary-social/nos/issues/1570) - Download and parse an author’s lists when viewing their profile. [#49](https://github.com/verse-pbc/issues/issues/49) +- Updated fastlane scripts to fix the TestFlight deployment pipeline. ## [1.0.3] - 2024-12-04Z diff --git a/Gemfile.lock b/Gemfile.lock index 99cdb9984..acf6a2d14 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,7 +10,7 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.1018.0) + aws-partitions (1.1024.0) aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) @@ -19,7 +19,7 @@ GEM aws-sdk-kms (1.96.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.176.0) + aws-sdk-s3 (1.176.1) aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -58,8 +58,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -68,7 +68,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.3.1) - fastlane (2.225.0) + fastlane (2.226.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -108,7 +108,7 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) + xcpretty (~> 0.4.0) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-plugin-changelog (0.16.0) fastlane-plugin-sentry (1.25.1) @@ -154,7 +154,7 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.6.2) @@ -178,8 +178,8 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.3.9) - rouge (2.0.7) + rexml (3.4.0) + rouge (3.28.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.5) @@ -210,8 +210,8 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.4.0) rexml (>= 3.3.6, < 4.0) - xcpretty (0.3.0) - rouge (~> 2.0.7) + xcpretty (0.4.0) + rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) @@ -227,4 +227,4 @@ DEPENDENCIES fastlane-plugin-versioning BUNDLED WITH - 2.5.20 + 2.5.22 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 53de02070..9e6b9cec2 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -156,15 +156,14 @@ platform :ios do push_to_git_remote end - desc "Refresh certificates in the match repo" - lane :certs do + desc "Revoke and delete old certificates in the match repo and request new ones" + lane :recreate_certs do app_store_connect_api_key( key_id: asc_key_id, issuer_id: asc_issuer_id, key_content: asc_key_content ) - match(type: "appstore", app_identifier: ["com.verse.Nos", "com.verse.Nos-dev", "com.verse.Nos-staging"]) - match(type: "development", app_identifier: ["com.verse.Nos", "com.verse.Nos-dev", "com.verse.Nos-staging"]) + match(type: "appstore", force: true, app_identifier: ["com.verse.Nos", "com.verse.Nos-dev", "com.verse.Nos-staging"]) end desc "Clean App Store Connect of certificates" diff --git a/fastlane/README.md b/fastlane/README.md index e0595f96b..214d09114 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -82,13 +82,13 @@ Push a new Nos Release build to TestFlight Mark a deployed commit as having been deployed to our public beta testers -### ios certs +### ios recreate_certs ```sh -[bundle exec] fastlane ios certs +[bundle exec] fastlane ios recreate_certs ``` -Refresh certificates in the match repo +Revoke and delete old certificates in the match repo and request new ones ### ios nuke_certs From b1b7395c20ac5aba75720a9204b532f70fa223ff Mon Sep 17 00:00:00 2001 From: mplorentz Date: Wed, 18 Dec 2024 10:30:22 -0500 Subject: [PATCH 2/2] Update changelog with ticket link --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e24291c05..30ce2f8da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Internal Changes - Upgraded to Xcode 16. [#1570](https://github.com/planetary-social/nos/issues/1570) - Download and parse an author’s lists when viewing their profile. [#49](https://github.com/verse-pbc/issues/issues/49) -- Updated fastlane scripts to fix the TestFlight deployment pipeline. +- Updated fastlane scripts to fix the TestFlight deployment pipeline. [#97](https://github.com/verse-pbc/issues/issues/97) ## [1.0.3] - 2024-12-04Z