Github Actions. Run test only if linter finished successfully. #2869 (#2869)

.github/workflows/mri.yml

@@ -1,86 +0,0 @@
-name: MRI
-
-on: [push, pull_request, workflow_dispatch]
-
-jobs:
-  build:
-    name: >-
-      ${{ matrix.os }} ${{ matrix.ruby }}${{ matrix.no-ssl }}${{ matrix.yjit }}
-    env:
-      CI: true
-      TESTOPTS: -v
-
-    runs-on: ${{ matrix.os }}
-    if: |
-      !(   contains(github.event.pull_request.title,  '[ci skip]')
-        || contains(github.event.pull_request.title,  '[skip ci]'))
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-20.04, ubuntu-18.04, macos-10.15, macos-11, windows-2022 ]
-        ruby: [ 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, head ]
-        no-ssl: ['']
-        yjit: ['']
-        include:
-          - { os: windows-2022 , ruby: ucrt }
-          - { os: windows-2022 , ruby: 2.7  , no-ssl: ' no SSL' }
-          - { os: ubuntu-20.04 , ruby: head , yjit: ' yjit' }
-          - { os: ubuntu-20.04 , ruby: 2.7  , no-ssl: ' no SSL' }
-
-        exclude:
-          - { os: ubuntu-20.04 , ruby: 2.2  }
-          - { os: ubuntu-20.04 , ruby: 2.3  }
-          - { os: windows-2022 , ruby: head }
-          - { os: macos-10.15  , ruby: 2.6  }
-          - { os: macos-10.15  , ruby: 2.7  }
-          - { os: macos-10.15  , ruby: '3.0'}
-          - { os: macos-10.15  , ruby: 3.1  }
-          - { os: macos-11     , ruby: 2.2  }
-          - { os: macos-11     , ruby: 2.3  }
-          - { os: macos-11     , ruby: 2.4  }
-
-    steps:
-      - name: repo checkout
-        uses: actions/checkout@v3
-
-      - name: load ruby
-        uses: MSP-Greg/setup-ruby-pkgs@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          apt-get: ragel
-          brew: ragel
-          # below is only needed for Rubies 2.4 and earlier
-          mingw: openssl ragel
-          bundler-cache: true
-        timeout-minutes: 10
-
-      # Windows error thrown, doesn't affect CI
-      - name: update rubygems for Ruby 2.2
-        if: matrix.ruby < '2.3'
-        run: gem update --system 2.7.11 --no-document
-        continue-on-error: true
-        timeout-minutes: 5
-
-      - name: Compile Puma without SSL support
-        if: matrix.no-ssl == ' no SSL'
-        shell: bash
-        run: echo 'DISABLE_SSL=true' >> $GITHUB_ENV
-
-      - name: set WERRORFLAG
-        shell: bash
-        run: echo 'MAKE_WARNINGS_INTO_ERRORS=true' >> $GITHUB_ENV
-
-      - name: compile
-        run:  bundle exec rake compile
-
-      - name: rubocop
-        run: bundle exec rake rubocop
-
-      - name: Use yjit
-        if: matrix.yjit == ' yjit'
-        shell: bash
-        run: echo 'RUBYOPT=--yjit' >> $GITHUB_ENV
-
-      - name: test
-        timeout-minutes: 10
-        run: bundle exec rake test:all

.github/workflows/non_mri.yml

@@ -1,76 +0,0 @@
-name: non_MRI
-
-on: [push, pull_request, workflow_dispatch]
-
-jobs:
-  build:
-    name: >-
-      ${{ matrix.os }} ${{ matrix.ruby }}${{ matrix.no-ssl }}
-    env:
-      CI: true
-      TESTOPTS: -v
-
-    runs-on: ${{ matrix.os }}
-    if: |
-      !(   contains(github.event.pull_request.title,  '[ci skip]')
-        || contains(github.event.pull_request.title,  '[skip ci]'))
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { os: ubuntu-20.04 , ruby: jruby }
-          - { os: ubuntu-20.04 , ruby: jruby, no-ssl: ' no SSL' }
-          - { os: ubuntu-20.04 , ruby: jruby-head, allow-failure: true }
-          - { os: ubuntu-20.04 , ruby: truffleruby }
-          - { os: ubuntu-20.04 , ruby: truffleruby-head, allow-failure: true }
-          - { os: macos-10.15  , ruby: jruby }
-          - { os: macos-10.15  , ruby: truffleruby }
-          - { os: macos-11     , ruby: jruby }
-          - { os: macos-11     , ruby: truffleruby }
-
-    steps:
-      - name: repo checkout
-        uses: actions/checkout@v3
-
-      - name: set JAVA_HOME
-        if: startsWith(matrix.os, 'macos')
-        shell: bash
-        run:  |
-          echo JAVA_HOME=$JAVA_HOME_11_X64 >> $GITHUB_ENV
-
-      - name: load ruby, ragel
-        uses: MSP-Greg/setup-ruby-pkgs@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          apt-get: ragel
-          brew: ragel
-          mingw: _upgrade_ openssl ragel
-          # Use the bundler shipped with that ruby,
-          # temporary workaround for https://github.com/oracle/truffleruby/issues/2586
-          bundler: none
-          bundler-cache: true
-        timeout-minutes: 10
-
-      - name: Compile Puma without SSL support
-        if: matrix.no-ssl == ' no SSL'
-        shell: bash
-        run: echo 'DISABLE_SSL=true' >> $GITHUB_ENV
-
-      - name: set WERRORFLAG
-        shell: bash
-        run: echo 'MAKE_WARNINGS_INTO_ERRORS=true' >> $GITHUB_ENV
-
-      - name: compile
-        run:  bundle exec rake compile
-
-      - name: test
-        id: test
-        timeout-minutes: 12
-        continue-on-error: ${{ matrix.allow-failure || false }}
-        if: success() # only run if previous steps have succeeded
-        run: bundle exec rake test:all
-
-      - name: >-
-          Test outcome: ${{ steps.test.outcome }}
-        # every step must define a `uses` or `run` key
-        run: echo NOOP

.github/workflows/tests.yaml

@@ -0,0 +1,170 @@
+name: Tests
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  rubocop:
+    name: 'Rubocop linting'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: MSP-Greg/setup-ruby-pkgs@v1
+        with:
+          ruby-version: 2.6
+          bundler-cache: true
+      - name: bundle install
+        run: bundle install --jobs 4 --retry 3
+      - name: rubocop
+        run: bundle exec rake rubocop
+
+  test_mri:
+    name: >-
+      MRI: ${{ matrix.os }} ${{ matrix.ruby }}${{ matrix.no-ssl }}${{ matrix.yjit }}
+    needs: rubocop
+    env:
+      CI: true
+      TESTOPTS: -v
+
+    runs-on: ${{ matrix.os }}
+    if: |
+      !(   contains(github.event.pull_request.title,  '[ci skip]')
+        || contains(github.event.pull_request.title,  '[skip ci]'))
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-20.04, ubuntu-18.04, macos-10.15, macos-11, windows-2022 ]
+        ruby: [ 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, head ]
+        no-ssl: ['']
+        yjit: ['']
+        include:
+          - { os: windows-2022 , ruby: ucrt }
+          - { os: windows-2022 , ruby: 2.7  , no-ssl: ' no SSL' }
+          - { os: ubuntu-20.04 , ruby: head , yjit: ' yjit' }
+          - { os: ubuntu-20.04 , ruby: 2.7  , no-ssl: ' no SSL' }
+
+        exclude:
+          - { os: ubuntu-20.04 , ruby: 2.2  }
+          - { os: ubuntu-20.04 , ruby: 2.3  }
+          - { os: windows-2022 , ruby: head }
+          - { os: macos-10.15  , ruby: 2.6  }
+          - { os: macos-10.15  , ruby: 2.7  }
+          - { os: macos-10.15  , ruby: '3.0'}
+          - { os: macos-10.15  , ruby: 3.1  }
+          - { os: macos-11     , ruby: 2.2  }
+          - { os: macos-11     , ruby: 2.3  }
+          - { os: macos-11     , ruby: 2.4  }
+
+    steps:
+      - name: repo checkout
+        uses: actions/checkout@v3
+
+      - name: load ruby
+        uses: MSP-Greg/setup-ruby-pkgs@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          apt-get: ragel
+          brew: ragel
+          # below is only needed for Rubies 2.4 and earlier
+          mingw: openssl ragel
+          bundler-cache: true
+        timeout-minutes: 10
+
+      # Windows error thrown, doesn't affect CI
+      - name: update rubygems for Ruby 2.2
+        if: matrix.ruby < '2.3'
+        run: gem update --system 2.7.11 --no-document
+        continue-on-error: true
+        timeout-minutes: 5
+
+      - name: Compile Puma without SSL support
+        if: matrix.no-ssl == ' no SSL'
+        shell: bash
+        run: echo 'DISABLE_SSL=true' >> $GITHUB_ENV
+
+      - name: set WERRORFLAG
+        shell: bash
+        run: echo 'MAKE_WARNINGS_INTO_ERRORS=true' >> $GITHUB_ENV
+
+      - name: compile
+        run:  bundle exec rake compile
+
+      - name: Use yjit
+        if: matrix.yjit == ' yjit'
+        shell: bash
+        run: echo 'RUBYOPT=--yjit' >> $GITHUB_ENV
+
+      - name: test
+        timeout-minutes: 10
+        run: bundle exec rake test:all
+  test_non_mri:
+    name: >-
+      NON-MRI: ${{ matrix.os }} ${{ matrix.ruby }}${{ matrix.no-ssl }}
+    needs: rubocop
+    env:
+      CI: true
+      TESTOPTS: -v
+
+    runs-on: ${{ matrix.os }}
+    if: |
+      !(   contains(github.event.pull_request.title,  '[ci skip]')
+        || contains(github.event.pull_request.title,  '[skip ci]'))
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { os: ubuntu-20.04 , ruby: jruby }
+          - { os: ubuntu-20.04 , ruby: jruby, no-ssl: ' no SSL' }
+          - { os: ubuntu-20.04 , ruby: jruby-head, allow-failure: true }
+          - { os: ubuntu-20.04 , ruby: truffleruby }
+          - { os: ubuntu-20.04 , ruby: truffleruby-head, allow-failure: true }
+          - { os: macos-10.15  , ruby: jruby }
+          - { os: macos-10.15  , ruby: truffleruby }
+          - { os: macos-11     , ruby: jruby }
+          - { os: macos-11     , ruby: truffleruby }
+
+    steps:
+      - name: repo checkout
+        uses: actions/checkout@v3
+
+      - name: set JAVA_HOME
+        if: startsWith(matrix.os, 'macos')
+        shell: bash
+        run:  |
+          echo JAVA_HOME=$JAVA_HOME_11_X64 >> $GITHUB_ENV
+
+      - name: load ruby, ragel
+        uses: MSP-Greg/setup-ruby-pkgs@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          apt-get: ragel
+          brew: ragel
+          mingw: _upgrade_ openssl ragel
+          # Use the bundler shipped with that ruby,
+          # temporary workaround for https://github.com/oracle/truffleruby/issues/2586
+          bundler: none
+          bundler-cache: true
+        timeout-minutes: 10
+
+      - name: Compile Puma without SSL support
+        if: matrix.no-ssl == ' no SSL'
+        shell: bash
+        run: echo 'DISABLE_SSL=true' >> $GITHUB_ENV
+
+      - name: set WERRORFLAG
+        shell: bash
+        run: echo 'MAKE_WARNINGS_INTO_ERRORS=true' >> $GITHUB_ENV
+
+      - name: compile
+        run:  bundle exec rake compile
+
+      - name: test
+        id: test
+        timeout-minutes: 12
+        continue-on-error: ${{ matrix.allow-failure || false }}
+        if: success() # only run if previous steps have succeeded
+        run: bundle exec rake test:all
+
+      - name: >-
+          Test outcome: ${{ steps.test.outcome }}
+        # every step must define a `uses` or `run` key
+        run: echo NOOP

README.md

@@ -4,8 +4,7 @@
 
 # Puma: A Ruby Web Server Built For Parallelism
 
-[![Actions MRI](https://github.com/puma/puma/workflows/MRI/badge.svg?branch=master)](https://github.com/puma/puma/actions?query=workflow%3AMRI)
+[![Actions](https://github.com/puma/puma/workflows/Tests/badge.svg?branch=master)](https://github.com/puma/puma/actions?query=workflow%3ATests)
-[![Actions non MRI](https://github.com/puma/puma/workflows/non_MRI/badge.svg?branch=master)](https://github.com/puma/puma/actions?query=workflow%3Anon_MRI)
 [![Code Climate](https://codeclimate.com/github/puma/puma.svg)](https://codeclimate.com/github/puma/puma)
 [![StackOverflow](https://img.shields.io/badge/stackoverflow-Puma-blue.svg)]( https://stackoverflow.com/questions/tagged/puma )