From 65f9c9c49d3db4320e3a2603584a747cf85ee87c Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 25 Feb 2025 08:27:04 -0800 Subject: [PATCH 1/2] Fix generate notice CI --- .github/actions/notices_generation/Gemfile | 5 +- .../actions/notices_generation/Gemfile.lock | 74 ++++++++++--------- 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/.github/actions/notices_generation/Gemfile b/.github/actions/notices_generation/Gemfile index 24197d9a369..3f210aee5b0 100644 --- a/.github/actions/notices_generation/Gemfile +++ b/.github/actions/notices_generation/Gemfile @@ -2,8 +2,5 @@ source "https://rubygems.org" # cocoapods isn't needed for generating the Gemfile.lock, but is needed for the CI job gem "cocoapods" -gem "octokit", "~> 4.19" -gem "xcodeproj", "~> 1.21" +gem "octokit" gem "plist" -# activesupport is locked because of https://github.com/CocoaPods/CocoaPods/issues/12081 -gem 'activesupport', '7.0.8' diff --git a/.github/actions/notices_generation/Gemfile.lock b/.github/actions/notices_generation/Gemfile.lock index 8ea9bd7b820..66e40537397 100644 --- a/.github/actions/notices_generation/Gemfile.lock +++ b/.github/actions/notices_generation/Gemfile.lock @@ -1,26 +1,29 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.5) + CFPropertyList (3.0.7) + base64 + nkf rexml activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) + base64 (0.2.0) claide (1.1.0) - cocoapods (1.12.1) + cocoapods (1.16.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.12.1) + cocoapods-core (= 1.16.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.6.0, < 2.0) @@ -32,8 +35,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.12.1) + xcodeproj (>= 1.27.0, < 2.0) + cocoapods-core (1.16.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -44,7 +47,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) + cocoapods-downloader (2.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -53,59 +56,62 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.5) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - faraday (1.1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords + faraday (2.8.1) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) ffi (1.16.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - httpclient (2.8.3) - i18n (1.14.1) + httpclient (2.9.0) + mutex_m + i18n (1.14.7) concurrent-ruby (~> 1.0) - json (2.7.2) - minitest (5.20.0) + json (2.10.1) + minitest (5.25.4) molinillo (0.8.0) - multipart-post (2.1.1) - nanaimo (0.3.0) + mutex_m (0.3.0) + nanaimo (0.4.0) nap (1.1.0) netrc (0.11.0) - octokit (4.19.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) - plist (3.6.0) - public_suffix (4.0.6) - rexml (3.3.9) + nkf (0.2.0) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + plist (3.7.2) + public_suffix (4.0.7) + rexml (3.4.1) ruby-macho (2.5.1) - ruby2_keywords (0.0.2) - sawyer (0.8.2) + ruby2_keywords (0.0.5) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.25.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (>= 3.3.2, < 4.0) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) PLATFORMS + ruby x86_64-linux DEPENDENCIES - activesupport (= 7.0.8) cocoapods - octokit (~> 4.19) + octokit plist - xcodeproj (~> 1.21) BUNDLED WITH 2.3.11 From 82d3099ff943783a7fc793ee4007f5adc1a7064c Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 25 Feb 2025 08:47:10 -0800 Subject: [PATCH 2/2] bundle install instead of bundle update --- .github/actions/notices_generation/Gemfile | 4 +- .../actions/notices_generation/Gemfile.lock | 49 ++++++++++++------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/.github/actions/notices_generation/Gemfile b/.github/actions/notices_generation/Gemfile index 3f210aee5b0..cbaf67c9bc1 100644 --- a/.github/actions/notices_generation/Gemfile +++ b/.github/actions/notices_generation/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" # cocoapods isn't needed for generating the Gemfile.lock, but is needed for the CI job -gem "cocoapods" -gem "octokit" +gem "cocoapods", ">= 1.16.2" +gem "octokit", "~> 4.19" gem "plist" diff --git a/.github/actions/notices_generation/Gemfile.lock b/.github/actions/notices_generation/Gemfile.lock index 66e40537397..82e64d458d3 100644 --- a/.github/actions/notices_generation/Gemfile.lock +++ b/.github/actions/notices_generation/Gemfile.lock @@ -5,18 +5,28 @@ GEM base64 nkf rexml - activesupport (7.0.8) + activesupport (7.1.5.1) + base64 + benchmark (>= 0.3) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) + mutex_m + securerandom (>= 0.3) tzinfo (~> 2.0) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) claide (1.1.0) cocoapods (1.16.2) addressable (~> 2.8) @@ -57,14 +67,14 @@ GEM cocoapods-try (1.2.0) colored2 (3.1.2) concurrent-ruby (1.3.5) + connection_pool (2.5.0) + drb (2.2.1) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - faraday (2.8.1) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (1.1.0) + multipart-post (>= 1.2, < 3) + ruby2_keywords ffi (1.16.3) fourflusher (2.3.1) fuzzy_match (2.0.4) @@ -74,24 +84,27 @@ GEM i18n (1.14.7) concurrent-ruby (~> 1.0) json (2.10.1) + logger (1.6.6) minitest (5.25.4) molinillo (0.8.0) + multipart-post (2.1.1) mutex_m (0.3.0) nanaimo (0.4.0) nap (1.1.0) netrc (0.11.0) nkf (0.2.0) - octokit (4.25.1) - faraday (>= 1, < 3) - sawyer (~> 0.9) - plist (3.7.2) - public_suffix (4.0.7) + octokit (4.19.0) + faraday (>= 0.9) + sawyer (~> 0.8.0, >= 0.5.3) + plist (3.6.0) + public_suffix (4.0.6) rexml (3.4.1) ruby-macho (2.5.1) - ruby2_keywords (0.0.5) - sawyer (0.9.2) + ruby2_keywords (0.0.2) + sawyer (0.8.2) addressable (>= 2.3.5) - faraday (>= 0.17.3, < 3) + faraday (> 0.8, < 2.0) + securerandom (0.3.2) typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) @@ -109,8 +122,8 @@ PLATFORMS x86_64-linux DEPENDENCIES - cocoapods - octokit + cocoapods (>= 1.16.2) + octokit (~> 4.19) plist BUNDLED WITH