Update policy and workflow

halostatue · Sep 16, 2024 · 9c2d514 · 9c2d514
1 parent 714bb8c
commit 9c2d514
Show file tree

Hide file tree

Showing 9 changed files with 303 additions and 222 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,6 @@
+# These are supported funding model platforms
+
+github: halostatue
+buy_me_a_coffee: halostatue
+ko_fi: halostatue
+tidelift: rubygems/diff-lcs
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Ruby CI
 
 on:
   pull_request:
@@ -7,62 +7,154 @@ on:
   workflow_dispatch:
 
 jobs:
-  test:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+          rubygems: latest
+          bundler: 2
+          bundler-cache: true
+
+      - run: bundle exec standardrb
+
+  required-ubuntu:
     name: Ruby ${{ matrix.ruby }} - ${{ matrix.os }}
+
     strategy:
       fail-fast: false
       matrix:
         os:
-          - macos-latest
           - ubuntu-20.04
+          - ubuntu-22.04
+          - ubuntu-24.04
         ruby:
-          - '2.4'
-          - '2.5'
           - '2.6'
           - '2.7'
-          - '3.0'
           - '3.1'
           - '3.2'
           - '3.3'
-          - head
           - jruby
-          - jruby-head
           - truffleruby
         include:
-          - ruby: head
-            continue-on-error: true
-          - ruby: jruby-head
-            continue-on-error: true
-          - os: windows-latest
-            ruby: mingw
-          - os: windows-latest
-            ruby: mswin
-          - os: windows-latest
-            ruby: jruby
+          - ruby: jruby
+            os: ubuntu-22.04
             continue-on-error: true
-          - os: ubuntu-22.04
-            ruby: head
+          - ruby: truffleruby
+            os: ubuntu-22.04
             continue-on-error: true
-          - os: ubuntu-22.04
-            ruby: '3.1'
-          - os: ubuntu-22.04
-            ruby: '3.2'
-          - os: ubuntu-22.04
-            ruby: '3.3'
-            standardrb: true
 
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.continue-on-error || false }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          rubygems: latest
+          bundler: 2
+          bundler-cache: true
+
+      - run: bundle exec ruby -S rake test --trace
+
+  required-macos:
+    name: Ruby ${{ matrix.ruby }} - ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-12
+          - macos-13
+          - macos-14
+        ruby:
+          - '2.6'
+          - '2.7'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          rubygems: latest
+          bundler: 2
+          bundler-cache: true
+
+      - run: bundle exec ruby -S rake test --trace
+
+  # Windows 2019 / Ruby 3.0 does not include libyaml, so we are removing it from the test
+  # cycle. All other versions succeed on Windows 2019 and Ruby 3.0 succeeds on Windows
+  # 2022. https://github.com/ruby/setup-ruby/issues/641
+  required-windows:
+    name: Ruby ${{ matrix.ruby }} - ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - windows-2019
+          - windows-2022
+        ruby:
+          - '2.6'
+          - '2.7'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+          - mswin
+          - ucrt
+        include:
+          - ruby: mingw
+            os: windows-2022
+          - ruby: '3.0'
+            os: windows-2022
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           rubygems: latest
+          bundler: 2
           bundler-cache: true
 
       - run: bundle exec ruby -S rake test --trace
 
-      - if: matrix.standardrb == true
-        run: bundle exec standardrb
+  ruby-head-optional:
+    name: Ruby ${{ matrix.ruby }} - ${{ matrix.os }} (optional)
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby:
+          - head
+        os:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
+
+    continue-on-error: true
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          rubygems: latest
+          bundler: 2
+          bundler-cache: true
+
+      - run: bundle exec ruby -S rake test --trace
diff --git a/.hoerc b/.hoerc
@@ -6,14 +6,14 @@ exclude: !ruby/regexp '/
   )$
   |
   \.(?:
-      bundle|
-      git|
-      github|
-      hg|
-      idea|
-      svn|
-      vagrant
-    )\/
+    bundle |
+    git |
+    github |
+    hg |
+    idea |
+    svn |
+    vagrant
+  )\/
   |
   [gG]emfile(?:\.lock)?
   |
@@ -22,31 +22,29 @@ exclude: !ruby/regexp '/
     research
   )\/
   |
+  \b(?i:TAGS)$
+  |
   \.(?:
     appveyor |
     coveralls |
     fasterer |
     pullreview |
-    rubocop.* |
+    rubocop* |
     travis |
     unused
-    )\.yml$
-  |
-  (?i:TAGS)$
+  )\.yml$
   |
   \.(?:
-      DS_Store |
-      autotest |
-      byebug_history |
-      gemtest |
-      gitattributes |
-      gitignore |
-      hoerc |
-      minitest.rb |
-      simplecov-prelude.rb
+    DS_Store |
+    autotest |
+    byebug_history |
+    gemtest |
+    gitattributes |
+    gitignore |
+    hoerc |
+    minitest.rb |
+    simplecov-prelude.rb
   )$
   |
   \.gemspec$
-  |
-  ^Vagrantfile$
   /x'