diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml deleted file mode 100644 index 2d603c6..0000000 --- a/.github/workflows/pull-request.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Tests & Linter on PRs -on: pull_request -jobs: - test: - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest, macos-latest] - # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0' - ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', head] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - bundler-cache: true # runs 'bundle install' and caches installed gems automatically - - run: bundle exec rake diff --git a/.github/workflows/push.yml b/.github/workflows/run-tests.yml similarity index 86% rename from .github/workflows/push.yml rename to .github/workflows/run-tests.yml index 5dac362..05bc690 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/run-tests.yml @@ -3,10 +3,11 @@ on: push: branches: - main + pull_request: + branches: + - main jobs: test: - env: - CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} strategy: fail-fast: false matrix: @@ -20,5 +21,5 @@ jobs: with: ruby-version: ${{ matrix.ruby }} bundler-cache: true # runs 'bundle install' and caches installed gems automatically - - name: Run tests + - name: Run tests and linter run: bundle exec rake