From 28ecdf649bd8f93780145c4e397831470088629a Mon Sep 17 00:00:00 2001
From: Ashok Manji <1902568+ashokm@users.noreply.github.com>
Date: Tue, 13 Sep 2022 14:37:34 +0200
Subject: [PATCH] Upgrade CodeQL Action and Ruby version in GitHub Actions

* Set Ruby version in tests to 3.1
* Upgrade to CodeQL Action v2
---
 .github/workflows/codeql-analysis.yml | 4 ++--
 .github/workflows/github-action.yml   | 2 +-
 .github/workflows/tests-linting.yml   | 4 ++--
 github-action/README.md               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 13c53653..e72ce616 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -29,7 +29,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -38,4 +38,4 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml
index f97ed092..2f7d3263 100644
--- a/.github/workflows/github-action.yml
+++ b/.github/workflows/github-action.yml
@@ -45,6 +45,6 @@ jobs:
           input_path: github-action/tests
           extra_args: -o sarif
           output_path: cfn_nag.sarif
-      - uses: github/codeql-action/upload-sarif@v1
+      - uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: cfn_nag.sarif
diff --git a/.github/workflows/tests-linting.yml b/.github/workflows/tests-linting.yml
index 1ca2396b..1be09248 100644
--- a/.github/workflows/tests-linting.yml
+++ b/.github/workflows/tests-linting.yml
@@ -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.1']
 
     steps:
     - uses: actions/checkout@master
@@ -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.1']
 
     steps:
     # is this the same commit hash we saw in commit?
diff --git a/github-action/README.md b/github-action/README.md
index f34ba17a..2e099ac4 100644
--- a/github-action/README.md
+++ b/github-action/README.md
@@ -75,7 +75,7 @@ Search the `templates` directory and upload the results to GitHub's Code Scannin
     input_path: templates
     extra_args: -o sarif
     output_path: cfn_nag.sarif
-- uses: github/codeql-action/upload-sarif@v1
+- uses: github/codeql-action/upload-sarif@v2
   with:
     sarif_file: cfn_nag.sarif
 ```
@@ -84,4 +84,4 @@ Search the `templates` directory and upload the results to GitHub's Code Scannin
 
 To report a bug or request a feature, submit an issue through the GitHub repository via: https://github.com/stelligent/cfn_nag/issues/new
 
-Pull requests are welcome as well: https://github.com/stelligent/cfn_nag/pulls
\ No newline at end of file
+Pull requests are welcome as well: https://github.com/stelligent/cfn_nag/pulls