Merge branch 'main' into feature/add_gh_actions_to_dependabot

sporkmonger · Jul 30, 2022 · a501948 · a501948
2 parents d77ba6b + a4d1f8b
commit a501948
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 29 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,11 +14,11 @@ jobs:
       matrix:
         ruby: [2.7]
         idna_mode: [native, pure]
-        os: [ubuntu-18.04]
+        os: [ubuntu-20.04]
     env:
       IDNA_MODE: ${{ matrix.idna_mode }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install libidn
         run: sudo apt-get install libidn11-dev
@@ -46,15 +46,15 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [2.7]
-        os: [ubuntu-18.04]
+        os: [ubuntu-20.04]
     env:
       BUNDLE_WITHOUT: development
       COVERALLS_SERVICE_NAME: github
       COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       COVERALLS_DEBUG: true
       CI_BUILD_NUMBER: ${{ github.run_id }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install libidn
         run: sudo apt-get install libidn11-dev
@@ -91,41 +91,29 @@ jobs:
           - jruby-9.1
           - jruby-9.2
           - jruby-9.3
-          - jruby-head
           - truffleruby-21.3
-          - truffleruby-head
+          - truffleruby-22.1
         os:
-          - ubuntu-18.04
+          - ubuntu-20.04
         gemfile:
           - Gemfile
         include:
-          - { os: ubuntu-18.04, ruby: 2.7, gemfile: gemfiles/public_suffix_2.rb }
-          - { os: ubuntu-18.04, ruby: 2.7, gemfile: gemfiles/public_suffix_3.rb }
-          # Ubuntu 20.04
-          - { os: ubuntu-20.04, ruby: 2.7 }
-          - { os: ubuntu-20.04, ruby: '3.0' }
-          - { os: ubuntu-20.04, ruby: 3.1 }
+          - { os: ubuntu-20.04, ruby: 2.7, gemfile: gemfiles/public_suffix_2.rb }
+          - { os: ubuntu-20.04, ruby: 2.7, gemfile: gemfiles/public_suffix_3.rb }
+          - { os: ubuntu-20.04, ruby: 2.7, gemfile: gemfiles/public_suffix_4.rb }
+          # Ubuntu
+          - { os: ubuntu-18.04, ruby: 2.7 }
+          - { os: ubuntu-22.04, ruby: 3.1 }
           # macOS
-          - { os: macos-10.15,  ruby: 2.7 }
-          - { os: macos-10.15,  ruby: '3.0' }
-          - { os: macos-10.15,  ruby: jruby }
-          - { os: macos-10.15,  ruby: truffleruby-21.3 }
-          - { os: macos-11,     ruby: 2.7 }
-          - { os: macos-11,     ruby: '3.0' }
           - { os: macos-11,     ruby: 3.1 }
-          - { os: macos-11,     ruby: jruby }
-          - { os: macos-11,     ruby: truffleruby-21.3 }
+          - { os: macos-12,     ruby: 3.1 }
           # Windows
-          - { os: windows-2019, ruby: 2.7 }
-          - { os: windows-2019, ruby: '3.0' }
           - { os: windows-2019, ruby: 3.1 }
           - { os: windows-2022, ruby: 3.1 }
-          - { os: windows-2019, ruby: jruby-9.1 }
-          - { os: windows-2019, ruby: jruby-9.2 }
-          - { os: windows-2019, ruby: jruby-9.3 }
+          - { os: windows-2022, ruby: jruby-9.3 }
           # allowed to fail
-          - { os: ubuntu-18.04, ruby: jruby-head, allow-failure: true }
-          - { os: ubuntu-18.04, ruby: truffleruby-head, allow-failure: true }
+          - { os: ubuntu-20.04, ruby: jruby-head, gemfile: Gemfile, allow-failure: true }
+          - { os: ubuntu-20.04, ruby: truffleruby-head, gemfile: Gemfile, allow-failure: true }
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
       BUNDLE_WITHOUT: development:coverage
@@ -134,7 +122,7 @@ jobs:
       # https://github.com/jruby/jruby/issues/7182#issuecomment-1112953015
       JAVA_OPTS: -Djdk.io.File.enableADS=true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install libidn (Ubuntu)
         if: startsWith(matrix.os, 'ubuntu')

diff --git a/gemfiles/public_suffix_4.rb b/gemfiles/public_suffix_4.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Assumes this gemfile is used from the project root
+eval_gemfile "../Gemfile"
+
+gem "public_suffix", "~> 4.0"