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.

Sign up for GitHub

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

Change maximum Ruby version in tests to 3.2 #593

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Change maximum Ruby version in tests to 3.2 #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11fff64
Change maximum Ruby version in tests to 3.1
petergoldstein Mar 31, 2022
27be089
Update max to Ruby 3.2 and upgrade checkout action versions
petergoldstein Jan 17, 2023
96bc160
Reorder for ease of debugging
petergoldstein Apr 3, 2023
9e34e85
Update rspec to address Ruby 3.2 error
petergoldstein Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gempush.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
needs: [tests-linting]
steps:
# is this the same commit hash we saw in commit?
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: |
git fetch --depth=1 origin +refs/tags/*:refs/tags/*
git fetch --prune --unshallow
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests-linting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false # Allows both ruby versions to run before failing
matrix:
ruby: ['2.5', '3.0']
ruby: ['2.5', '3.2']

steps:
- uses: actions/checkout@master
Expand All @@ -42,7 +42,7 @@ jobs:
strategy:
fail-fast: false # Allows both ruby versions to run before failing
matrix:
ruby: ['2.5', '3.0']
ruby: ['2.5', '3.2']

steps:
# is this the same commit hash we saw in commit?
Expand Down
24 changes: 12 additions & 12 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ GEM
cfn-model (0.6.6)
kwalify (= 0.7.2)
psych (~> 3)
diff-lcs (1.4.4)
diff-lcs (1.5.0)
docile (1.3.5)
jmespath (1.6.1)
kwalify (0.7.2)
Expand All @@ -53,19 +53,19 @@ GEM
rake (13.0.1)
regexp_parser (2.1.1)
rexml (3.2.5)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.1)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.1)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-mocks (3.10.2)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.2)
rspec-support (~> 3.12.0)
rspec-support (3.12.0)
rubocop (1.22.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
Expand Down
2 changes: 1 addition & 1 deletion lib/cfn-nag/cfn_nag_executor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ def cfn_nag_config(opts)
print_suppression: opts[:print_suppression],
isolate_custom_rule_exceptions: opts[:isolate_custom_rule_exceptions],
fail_on_warnings: opts[:fail_on_warnings],
rule_repository_definitions: @rule_repository_definitions,
ignore_fatal: opts[:ignore_fatal],
rule_repository_definitions: @rule_repository_definitions,
rule_arguments: merge_rule_arguments(opts),
rule_directory_recursive: opts[:rule_directory_recursive]
)
Expand Down