Bump actions/checkout from 3 to 4 (#31)

* Bump actions/checkout from 3 to 4 * ruby.yml - update Actions image/os list, Windows openssl, misc * Update OpenSSL install on Windows 2019, yarn/ncc
ruby · Sep 7, 2023 · 070791a · 070791a
1 parent af45875
commit 070791a
Show file tree

Hide file tree

Showing 6 changed files with 186 additions and 170 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -20,12 +20,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, ubuntu-18.04, macos-11, macos-10.15 ]
-        ruby: [ ruby-head, 3.1, '3.0', 2.7, 2.5, 2.2, jruby, truffleruby ]
+        os: [ ubuntu-22.04, ubuntu-20.04, macos-13, macos-12, macos-11 ]
+        ruby: [ ruby-head, 3.2, 3.1, '3.0', 2.7, 2.5, 2.2, jruby, truffleruby ]
+        exclude:
+          - { os: ubuntu-22.04 , ruby:  2.2 }
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Ruby Install
         uses: ./
@@ -39,27 +41,26 @@ jobs:
           ruby -v
           echo ''
           gcc --version
-          echo ''
           openssl version
           echo ''
           ragel --version
           echo ''
           bundler version
           echo ''
-          gem --version
+          echo "RubyGems $(gem --version)"
 
   win32:
     name: >-
       ${{ matrix.os }} ${{ matrix.ruby }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ windows-2019, windows-2022 ]
-        ruby: [ mswin, mingw, ucrt, head, 3.1, '3.0', 2.5, 2.4, 2.3, 2.2 ]
+        os: [ windows-2022, windows-2019 ]
+        ruby: [ mswin, mingw, ucrt, head, 3.2, 3.1, '3.0', 2.5, 2.4, 2.3, 2.2 ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Ruby Install
         uses: ./
@@ -94,35 +95,7 @@ jobs:
         timeout-minutes: 5
 
       - name: gem install openssl
-        if:   ((matrix.ruby >= '2.4') && (matrix.ruby <= '3.2')) || (matrix.ruby == 'head')
+        if:   |
+          ((matrix.ruby >= '2.5') && (matrix.os == 'windows-2019'))
+          || ((matrix.ruby >= '2.4') && (matrix.os >= 'windows-2022'))
         run:  gem install openssl -N
-
-  plus:
-    name: >-
-      plus ${{ matrix.os }} ${{ matrix.ruby }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-20.04, macos-11 ]
-        ruby: [ '3.0' ]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Ruby Install
-        uses: ./
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          apt-get: g++
-          brew: libxml++3
-
-      - name: Info
-        run:  |
-          ruby -v
-          echo ''
-          gcc --version
-          echo ''
-          bundler version
-          echo ''
-          gem --version