Skip to content

Commit 6c50f7b

Browse files
committed
Use Ruby 3.1. Upgrade gems. Upgrade Terraform. Control CI concurrency. Rotate SSH keys.
1 parent 906f71f commit 6c50f7b

File tree

12 files changed

+728
-682
lines changed

12 files changed

+728
-682
lines changed

.circleci/config.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
version: 2.1
2+
orbs:
3+
queue: eddiewebb/queue@1.6.4
24
jobs:
35
test:
46
working_directory: ~/terraform-aws-network-load-balancer
57
docker:
6-
- image: ruby:2.7.5
8+
- image: ruby:3.1.1
79
steps:
810
- checkout
911
- run: ./scripts/ci/common/install-git-crypt.sh
12+
- run: ./scripts/ci/common/install-orb-deps.sh
13+
- queue/until_front_of_line:
14+
consider-branch: false
1015
- run: ./scripts/ci/steps/test.sh
1116
merge_pull_request:
1217
working_directory: ~/terraform-aws-network-load-balancer
1318
docker:
14-
- image: ruby:2.7.5
19+
- image: ruby:3.1.1
1520
steps:
1621
- checkout
1722
- run: ./scripts/ci/common/install-git-crypt.sh
@@ -21,7 +26,7 @@ jobs:
2126
prerelease:
2227
working_directory: ~/terraform-aws-network-load-balancer
2328
docker:
24-
- image: ruby:2.7.5
29+
- image: ruby:3.1.1
2530
steps:
2631
- checkout
2732
- run: ./scripts/ci/common/install-git-crypt.sh
@@ -31,7 +36,7 @@ jobs:
3136
release:
3237
working_directory: ~/terraform-aws-network-load-balancer
3338
docker:
34-
- image: ruby:2.7.5
39+
- image: ruby:3.1.1
3540
steps:
3641
- checkout
3742
- run: ./scripts/ci/common/install-git-crypt.sh

.envrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
PROJECT_DIR="$(pwd)"
44

5-
PATH_add ${PROJECT_DIR}
6-
PATH_add ${PROJECT_DIR}/vendor/terraform/bin
5+
PATH_add "${PROJECT_DIR}"
6+
PATH_add "${PROJECT_DIR}"/vendor/terraform/bin

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
vendor/
1313
build/
1414
dist/
15+
.bundle
1516
.rakeTasks
1617

1718
# OS
@@ -22,7 +23,6 @@ run/pids/
2223
run/logs/
2324
*.log
2425
.tmp
25-
.rakeTasks
2626

2727
# RSpec
2828
.rspec_status

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.5
1+
3.1.1

Gemfile

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
source 'https://rubygems.org'
22

3-
gem 'rake', '~> 13.0'
4-
gem 'rake_dependencies', '~> 2.13'
5-
gem 'rake_terraform', '~> 1.21'
6-
gem 'rake_circle_ci', '~> 0.9'
7-
gem 'rake_github', '0.9.0'
8-
gem 'rake_ssh', '~> 0.6'
9-
gem 'rake_gpg', '~> 0.14'
10-
gem 'confidante', '~> 0.27'
11-
gem 'rspec', '~> 3.11'
12-
gem 'awspec', '~> 1.25'
13-
gem 'git', '~> 1.10'
14-
gem 'semantic', '~> 1.6'
3+
gem 'awspec'
4+
gem 'confidante'
5+
gem 'git'
6+
gem 'nokogiri'
7+
gem 'rake'
8+
gem 'rake_circle_ci'
9+
gem 'rake_dependencies'
10+
gem 'rake_github'
11+
gem 'rake_gpg'
12+
gem 'rake_ssh'
13+
gem 'rake_terraform'
14+
gem 'rspec'
15+
gem 'semantic'

0 commit comments

Comments
 (0)