Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fastlane][ci] Lock google-cloud-env < 2.0.0 for Ruby 2.6 and fix CI to use specified ruby versions #21777

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 13 additions & 17 deletions .circleci/config.yml
Expand Up @@ -2,7 +2,8 @@

version: 2.1
orbs:
shellcheck: circleci/shellcheck@2.2.2 # brew install shellcheck stopped working so using this
shellcheck: circleci/shellcheck@2.2.2 # brew install shellcheck stopped working so using this
macos: circleci/macos@2

aliases:
- &important-branches
Expand Down Expand Up @@ -50,12 +51,6 @@ aliases:
paths:
- "~/.cache/rubocop_cache"

- &set_ruby
run:
name: Set Ruby version
command: | # see https://circleci.com/docs/2.0/testing-ios/#using-ruby
echo "ruby-${_RUBY_VERSION}" > ~/.ruby-version

- &bundle_install
run:
name: bundle install
Expand All @@ -81,14 +76,14 @@ jobs:
CIRCLE_TEST_REPORTS: '~/test-reports'
LC_ALL: 'en_US.UTF-8'
LANG: 'en_US.UTF-8'
_RUBY_VERSION: << parameters.ruby_version >>
shell: '/bin/bash --login -eo pipefail'
steps:
- *cache_restore_git
- checkout
- *cache_save_git
- *cache_restore_bundler
- *set_ruby
- macos/switch-ruby:
version: << parameters.ruby_version >>
- run:
name: debug | ruby version
command: |
Expand Down Expand Up @@ -178,7 +173,8 @@ jobs:
- checkout
- *cache_save_git
- *cache_restore_bundler
- *set_ruby
- macos/switch-ruby:
version: << parameters.ruby_version >>
- *bundle_install
- *cache_save_bundler
- run:
Expand Down Expand Up @@ -289,27 +285,27 @@ workflows:
- tests_macos:
name: 'Execute tests on macOS (Xcode 14.3.1, Ruby 3.1)'
xcode_version: '14.3.1'
ruby_version: '3.1.4'
ruby_version: '3.1'
ruby_opt: -W:deprecated
- tests_macos:
name: 'Execute tests on macOS (Xcode 15.0.1, Ruby 3.1)'
xcode_version: '15.0.1'
ruby_version: '3.1.4'
ruby_version: '3.1'
ruby_opt: -W:deprecated
- tests_macos:
name: 'Execute tests on macOS (Xcode 13.4.1, Ruby 3.2)'
name: 'Execute tests on macOS (Xcode 13.4.1, Ruby 3.1)'
xcode_version: '13.4.1'
ruby_version: '3.2.2'
ruby_version: '3.1'
ruby_opt: -W:deprecated
- tests_macos:
name: 'Execute tests on macOS (Xcode 14.3.1, Ruby 3.2)'
xcode_version: '14.3.1'
ruby_version: '3.2.2'
ruby_version: '3.2'
ruby_opt: -W:deprecated
- tests_macos:
name: 'Execute tests on macOS (Xcode 15.0.1, Ruby 3.2)'
xcode_version: '15.0.1'
ruby_version: '3.2.2'
ruby_version: '3.2'
ruby_opt: -W:deprecated
- tests_ubuntu:
name: 'Execute tests on Ubuntu'
Expand All @@ -322,7 +318,7 @@ workflows:
- validate_documentation:
name: 'Validate Documentation'
image: 'cimg/ruby:3.2.2'
ruby_version: '3.2.2'
ruby_version: '3.2'
- lint_source_code:
name: 'Lint source code'
image: 'cimg/ruby:2.6'
Expand Down
1 change: 1 addition & 0 deletions Gemfile.lock
Expand Up @@ -20,6 +20,7 @@ PATH
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)
Expand Down
1 change: 1 addition & 0 deletions fastlane.gemspec
Expand Up @@ -87,6 +87,7 @@ Gem::Specification.new do |spec|
spec.add_dependency('gh_inspector', '>= 1.1.2', '< 2.0.0') # search for issues on GitHub when something goes wrong
spec.add_dependency('google-apis-androidpublisher_v3', '~> 0.3') # Google API Client to access Play Publishing API
spec.add_dependency('google-apis-playcustomapp_v1', '~> 0.1') # Google API Client to access Custom app Publishing API
spec.add_dependency('google-cloud-env', '>= 1.6.0', '< 2.0.0') # Must be < 2.0.0 to support Ruby 2.6
spec.add_dependency('google-cloud-storage', '~> 1.31') # Access Google Cloud Storage for match
spec.add_dependency('highline', '~> 2.0') # user inputs (e.g. passwords)
spec.add_dependency('http-cookie', '~> 1.0.5') # Must be 1.0.5+ for Ruby 3 compatibility: https://github.com/sparklemotion/http-cookie/commit/d12449a983d3dd660c5fe1f2b135c35e83755cc3
Expand Down