Merge branch 'main' into main

Author: GrantBirki

.github/workflows/acceptance.yml

@@ -6,18 +6,19 @@ on:
       - main
   pull_request:
 
+permissions:
+  contents: read
+
 jobs:
   # Detects changes to any of the source files for entitlements-app
   changes:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
 
     outputs:
       has_change: ${{ steps.diff.outputs.has_change}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - id: fetch-base
         if: github.event_name == 'pull_request'
@@ -56,9 +57,7 @@ jobs:
     name: runner / acceptance-tests
     strategy:
       matrix:
-        ruby: [ '2.7.5', '3.1.2' ]
-    permissions:
-      contents: read
+        ruby: [ '2.7.5', '3.1.2', '3.2.2', '3.3.0' ]
 
     steps:
       - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # [email protected]
@@ -74,7 +73,7 @@ jobs:
 
       - name: checkout
         if: ${{ needs.changes.outputs.has_change == 'true' }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Use Docker layer caching for 'docker build' and 'docker-compose build' commands.
       # https://github.com/satackey/action-docker-layer-caching/releases/tag/v0.0.11

.github/workflows/build.yml

@@ -15,11 +15,15 @@ permissions:
 jobs:
   build:
     name: build
-    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # [email protected]
         with:

.github/workflows/codeql-analysis.yml

@@ -9,14 +9,15 @@ on:
   schedule:
     - cron: '25 4 * * 5'
 
+permissions:
+  actions: read
+  contents: read
+  security-events: write
+
 jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
 
     strategy:
       fail-fast: false
@@ -25,7 +26,7 @@ jobs:
 
     steps:
     - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/lint.yml

@@ -6,19 +6,20 @@ on:
       - main
   pull_request:
 
+permissions:
+  contents: read
+
 jobs:
   rubocop:
     name: runner / rubocop
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.7.5', '3.1.2' ]
-    permissions:
-      contents: read
+        ruby: [ '2.7.5', '3.1.2', '3.2.2', '3.3.0' ]
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # [email protected]
         with:

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # [email protected]
         with:

.github/workflows/test.yml

@@ -6,19 +6,20 @@ on:
       - main
   pull_request:
 
+permissions:
+  contents: read
+
 jobs:
   rubocop:
     name: runner / rspec
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.7.5', '3.1.2' ]
-    permissions:
-      contents: read
+        ruby: [ '2.7.5', '3.1.2', '3.2.2', '3.3.0' ]
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # [email protected]
         with:

.gitignore

@@ -17,3 +17,5 @@ coverage/*
 
 # Ignore JetBrains IDEs
 .idea
+
+tmp/

.rubocop.yml

@@ -5,7 +5,7 @@ inherit_gem:
 AllCops:
   SuggestExtensions: false
   DisplayCopNames: true
-  TargetRubyVersion: 3.1.2
+  TargetRubyVersion: 3.3.0
   Exclude:
     - 'bin/*'
     - 'vendor/**/*'

.ruby-version

@@ -1 +1 @@
-3.1.2
+3.3.0

Gemfile.lock

@@ -94,7 +94,7 @@ GEM
       rubocop (>= 1.7.0, < 2.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    rugged (0.27.5)
+    rugged (1.7.2)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
@@ -126,7 +126,7 @@ DEPENDENCIES
   rubocop (= 1.29.1)
   rubocop-github (= 0.17.0)
   rubocop-performance (= 1.13.3)
-  rugged (= 0.27.5)
+  rugged (~> 1.7, >= 1.7.2)
   simplecov (= 0.16.1)
   simplecov-erb (= 1.0.1)
   vcr (= 4.0.0)