Skip to content

Commit

Permalink
Upgrade Ruby.
Browse files Browse the repository at this point in the history
  • Loading branch information
@tobyclemson
tobyclemson committed Jul 17, 2024
1 parent f12f7d4 commit e68975a
Show file tree
Hide file tree
Showing 27 changed files with 448 additions and 366 deletions.
51 changes: 41 additions & 10 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
version: 2.1

orbs:
slack: circleci/slack@4.8.3
slack: circleci/slack@4.13.2

defaults: &defaults
base_container: &base_container
image: buildpack-deps:buster

build_container: &build_container
resource_class: arm.medium
docker:
- image: ruby:2.7.5
- <<: *base_container

slack_context: &slack_context
context:
Expand Down Expand Up @@ -61,49 +65,76 @@ commands:
event: pass
channel: builds
template: SLACK_SUCCESS_NOTIFICATION
configure_tools:

configure_build_tools:
steps:
- run: ./scripts/ci/common/install-slack-deps.sh
- restore_cache:
keys:
- asdf-dependencies-{{ arch }}-v2-{{ checksum ".tool-versions" }}
- asdf-dependencies-{{ arch }}-v2-
- run: ./scripts/ci/common/install-asdf.sh
- run: ./scripts/ci/common/configure-asdf.sh
- run: ./scripts/ci/common/install-asdf-dependencies.sh
- save_cache:
key: asdf-dependencies-{{ arch }}-v2-{{ checksum ".tool-versions" }}
paths:
- ~/.asdf

configure_secrets_tools:
steps:
- run: ./scripts/ci/common/install-git-crypt.sh
- run: ./scripts/ci/common/install-gpg-key.sh
- run: ./scripts/ci/common/install-orb-deps.sh
- run: ./scripts/ci/common/configure-git.sh

configure_release_tools:
steps:
- add_ssh_keys:
fingerprints:
- "SHA256:yeDkuBjG5lpLbRB5Ubp4Gs7z5l1h8tiskiDuNKBOoH8"
- run: ./scripts/ci/common/configure-rubygems.sh

configure_tools:
steps:
- configure_build_tools
- configure_secrets_tools
- configure_release_tools

jobs:
build:
<<: *defaults
<<: *build_container
steps:
- checkout
- configure_tools
- run: ./scripts/ci/steps/build.sh
- notify

test:
<<: *defaults
<<: *build_container
steps:
- checkout
- configure_tools
- run: ./scripts/ci/steps/test.sh
- notify

prerelease:
<<: *defaults
<<: *build_container
steps:
- checkout
- configure_tools
- run: ./scripts/ci/steps/prerelease.sh
- notify

release:
<<: *defaults
<<: *build_container
steps:
- checkout
- configure_tools
- run: ./scripts/ci/steps/release.sh
- notify

merge_pull_request:
<<: *defaults
<<: *build_container
steps:
- checkout
- configure_tools
Expand Down
1 change: 0 additions & 1 deletion .ruby-version
View file

This file was deleted.

2 changes: 1 addition & 1 deletion .tool-versions
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 2.7.5
ruby 3.1.1
137 changes: 69 additions & 68 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ PATH
rake_circle_ci (0.12.0.pre.4)
colored2 (~> 3.1)
excon (~> 0.72)
rake_factory (~> 0.31)
rake_factory (~> 0.33)
sshkey (~> 2.0)

GEM
remote: https://rubygems.org/
specs:
activesupport (7.1.2)
activesupport (7.1.3.4)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -20,123 +20,122 @@ GEM
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ast (2.4.2)
base64 (0.2.0)
bigdecimal (3.1.4)
bigdecimal (3.1.8)
childprocess (5.0.0)
colored2 (3.1.2)
concurrent-ruby (1.2.2)
concurrent-ruby (1.3.3)
connection_pool (2.4.1)
diff-lcs (1.5.0)
diff-lcs (1.5.1)
docile (1.4.0)
drb (2.2.0)
ruby2_keywords
excon (0.108.0)
faraday (2.7.11)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
drb (2.2.1)
excon (0.111.0)
faraday (2.10.0)
faraday-net_http (>= 2.0, < 3.2)
logger
faraday-net_http (3.1.0)
net-http
gem-release (2.2.2)
git (1.18.0)
git (1.19.1)
addressable (~> 2.8)
rchardet (~> 1.8)
hamster (3.0.0)
concurrent-ruby (~> 1.0)
i18n (1.14.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
immutable-struct (2.4.1)
json (2.7.1)
json (2.7.2)
language_server-protocol (3.17.0.3)
lino (3.1.0)
lino (4.1.0)
childprocess (~> 5.0.0)
hamster (~> 3.0)
open4 (~> 1.3)
logger (1.6.0)
memfs (1.0.0)
minitest (5.20.0)
minitest (5.24.1)
mutex_m (0.2.0)
octokit (8.0.0)
net-http (0.4.1)
uri
octokit (8.1.0)
base64
faraday (>= 1, < 3)
sawyer (~> 0.9)
open4 (1.3.4)
parallel (1.23.0)
parser (3.2.2.4)
parallel (1.25.1)
parser (3.3.4.0)
ast (~> 2.4.1)
racc
public_suffix (5.0.3)
racc (1.7.3)
public_suffix (6.0.0)
racc (1.8.0)
rainbow (3.1.1)
rake (13.1.0)
rake_factory (0.32.0.pre.2)
rake (13.2.1)
rake_factory (0.33.0)
activesupport (>= 4)
rake (~> 13.0)
rake_git (0.1.0.pre.10)
rake_git (0.2.0)
colored2 (~> 3.1)
git (~> 1.13, >= 1.13.2)
rake_factory (= 0.32.0.pre.2)
rake_git_crypt (0.1.0.pre.29)
rake_factory (~> 0.33)
rake_git_crypt (0.2.0)
colored2 (~> 3.1)
rake_factory (= 0.32.0.pre.2)
ruby_git_crypt (= 0.1.0.pre.4)
ruby_gpg2 (~> 0.6)
rake_factory (~> 0.33)
ruby_git_crypt (~> 0.1)
ruby_gpg2 (~> 0.12)
rake_github (0.13.0)
colored2 (~> 3.1)
octokit (>= 4.16, < 9.0)
rake_factory (~> 0.23)
sshkey (~> 2.0)
rake_gpg (0.18.0)
rake_factory (~> 0.23)
ruby_gpg2 (~> 0.6)
rake_gpg (0.20.0)
rake_factory (~> 0.33)
ruby_gpg2 (~> 0.12)
rake_ssh (0.10.0)
colored2 (~> 3.1)
rake_factory (~> 0.23)
sshkey (~> 2.0)
rchardet (1.8.0)
regexp_parser (2.8.3)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
regexp_parser (2.9.2)
rexml (3.3.2)
strscan
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rubocop (1.59.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rubocop (1.65.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.4)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.19.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.24.0)
rubocop (~> 1.33)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.25.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
rubocop-rspec (3.0.3)
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
ruby_git_crypt (0.1.0.pre.4)
ruby_git_crypt (0.1.0)
immutable-struct (~> 2.4)
lino (~> 3.0)
ruby_gpg2 (0.10.0)
lino (~> 3.0)
lino (>= 4.1)
ruby_gpg2 (0.12.0)
lino (>= 4.1)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
Expand All @@ -147,9 +146,11 @@ GEM
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
sshkey (2.0.0)
strscan (3.1.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
uri (0.13.0)

PLATFORMS
ruby
Expand Down
12 changes: 6 additions & 6 deletions lib/rake_circle_ci.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
require 'rake_circle_ci/task_sets'

module RakeCircleCI
def self.define_environment_variables_tasks(opts = {}, &block)
RakeCircleCI::TaskSets::EnvironmentVariables.define(opts, &block)
def self.define_environment_variables_tasks(opts = {}, &)
RakeCircleCI::TaskSets::EnvironmentVariables.define(opts, &)
end

def self.define_ssh_keys_tasks(opts = {}, &block)
RakeCircleCI::TaskSets::SSHKeys.define(opts, &block)
def self.define_ssh_keys_tasks(opts = {}, &)
RakeCircleCI::TaskSets::SSHKeys.define(opts, &)
end

def self.define_project_tasks(opts = {}, &block)
RakeCircleCI::TaskSets::Project.define(opts, &block)
def self.define_project_tasks(opts = {}, &)
RakeCircleCI::TaskSets::Project.define(opts, &)
end
end
Loading

0 comments on commit e68975a

Please sign in to comment.