From 33a1b3a3447b3f2e94244fbd6988792266e51cae Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 17 Jun 2025 13:39:49 -0400 Subject: [PATCH 1/4] add PR 29596 to fastlane_2.228.0 --- Gemfile | 5 ++- Gemfile.lock | 98 ++++++++++++++++++++++++++++------------------------ 2 files changed, 56 insertions(+), 47 deletions(-) diff --git a/Gemfile b/Gemfile index 7a118b49..6d8667c8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,6 @@ source "https://rubygems.org" -gem "fastlane" +# gem "fastlane" + +# This branch uses fastlane 2.228.0 plus pr 29596 +gem "fastlane", git: "https://github.com/loopandlearn/fastlane.git", ref: "a670d4b092b274d58ebb5497126e47fc6a84f533" diff --git a/Gemfile.lock b/Gemfile.lock index abb8fc41..d10e9b9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,51 @@ +GIT + remote: https://github.com/loopandlearn/fastlane.git + revision: a670d4b092b274d58ebb5497126e47fc6a84f533 + ref: a670d4b092b274d58ebb5497126e47fc6a84f533 + specs: + fastlane (2.228.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.4.1) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + GEM remote: https://rubygems.org/ specs: @@ -10,7 +58,7 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.4.0) - aws-partitions (1.1115.0) + aws-partitions (1.1116.0) aws-sdk-core (3.225.2) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) @@ -18,7 +66,7 @@ GEM base64 jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.104.0) + aws-sdk-kms (1.105.0) aws-sdk-core (~> 3, >= 3.225.0) aws-sigv4 (~> 1.5) aws-sdk-s3 (1.189.1) @@ -70,48 +118,6 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.228.0) - CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.8, < 3.0.0) - artifactory (~> 3.0) - aws-sdk-s3 (~> 1.0) - babosa (>= 1.0.3, < 2.0.0) - bundler (>= 1.12.0, < 3.0.0) - colored (~> 1.2) - commander (~> 4.6) - dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (>= 0.1, < 4.0) - excon (>= 0.71.0, < 1.0.0) - faraday (~> 1.0) - faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 1.0) - fastimage (>= 2.1.0, < 3.0.0) - fastlane-sirp (>= 1.0.0) - gh_inspector (>= 1.1.2, < 2.0.0) - google-apis-androidpublisher_v3 (~> 0.3) - google-apis-playcustomapp_v1 (~> 0.1) - google-cloud-env (>= 1.6.0, < 2.0.0) - google-cloud-storage (~> 1.31) - highline (~> 2.0) - http-cookie (~> 1.0.5) - json (< 3.0.0) - jwt (>= 2.1.0, < 3) - mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (>= 2.0.0, < 3.0.0) - naturally (~> 2.2) - optparse (>= 0.1.1, < 1.0.0) - plist (>= 3.1.0, < 4.0.0) - rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.5) - simctl (~> 1.6.3) - terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (~> 3) - tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.8.0, < 1.0.0) - word_wrap (~> 1.0.0) - xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.4.1) - xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-sirp (1.0.0) sysrandom (~> 1.0) gh_inspector (1.1.3) @@ -167,7 +173,7 @@ GEM multipart-post (2.4.1) mutex_m (0.3.0) nanaimo (0.4.0) - naturally (2.2.2) + naturally (2.3.0) nkf (0.2.0) optparse (0.6.0) os (1.1.4) @@ -226,7 +232,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - fastlane + fastlane! BUNDLED WITH 2.6.2 From f158d94d138b0a169a44ce551eed087893fd9423 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 17 Jun 2025 14:08:13 -0400 Subject: [PATCH 2/4] modify configure_bundle_id --- fastlane/Fastfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index ee5d2ada..5ba62aac 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -157,10 +157,15 @@ platform :ios do ) def configure_bundle_id(name, identifier, capabilities) - bundle_id = Spaceship::ConnectAPI::BundleId.find(identifier) || Spaceship::ConnectAPI::BundleId.create(name: name, identifier: identifier) - capabilities.each { |capability| - bundle_id.create_capability(capability) - } + bundle_id = Spaceship::ConnectAPI::BundleId.find(identifier) || Spaceship::ConnectAPI::BundleId.create( + name: name, + identifier: identifier, + platform: "IOS" + ) + existing = bundle_id.get_capabilities.map(&:capability_type) + capabilities.reject { |c| existing.include?(c) }.each do |cap| + bundle_id.create_capability(cap) + end end configure_bundle_id("LoopCaregiver", "com.#{TEAMID}.loopkit.LoopCaregiver", [ From 5858a1d3fcad8c29840ea92f1c97273e3b44beab Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 17 Jun 2025 20:55:22 -0400 Subject: [PATCH 3/4] make add identifiers match LoopWorkspace --- .github/workflows/add_identifiers.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/add_identifiers.yml b/.github/workflows/add_identifiers.yml index ea4ab411..48038bd3 100644 --- a/.github/workflows/add_identifiers.yml +++ b/.github/workflows/add_identifiers.yml @@ -20,7 +20,18 @@ jobs: # Patch Fastlane Match to not print tables - name: Patch Match Tables - run: find /usr/local/lib/ruby/gems -name table_printer.rb | xargs sed -i "" "/puts(Terminal::Table.new(params))/d" + run: | + TABLE_PRINTER_PATH=$(ruby -e 'puts Gem::Specification.find_by_name("fastlane").gem_dir')/match/lib/match/table_printer.rb + if [ -f "$TABLE_PRINTER_PATH" ]; then + sed -i "" "/puts(Terminal::Table.new(params))/d" "$TABLE_PRINTER_PATH" + else + echo "table_printer.rb not found" + exit 1 + fi + + # Install project dependencies + - name: Install Project Dependencies + run: bundle install # Sync the GitHub runner clock with the Windows time server (workaround as suggested in https://github.com/actions/runner/issues/2996) - name: Sync clock From fdfd7a3a8c5a7403a2bf6fa0c013000592ad4656 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Wed, 18 Jun 2025 20:34:07 -0400 Subject: [PATCH 4/4] use bundle exec for add_identifiers --- .github/workflows/add_identifiers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add_identifiers.yml b/.github/workflows/add_identifiers.yml index 48038bd3..864dcc3d 100644 --- a/.github/workflows/add_identifiers.yml +++ b/.github/workflows/add_identifiers.yml @@ -39,7 +39,7 @@ jobs: # Create or update identifier for LoopCaregiver - name: Fastlane Provision Caregiver - run: fastlane caregiver_identifier + run: bundle exec fastlane caregiver_identifier env: TEAMID: ${{ secrets.TEAMID }} GH_PAT: ${{ secrets.GH_PAT }}