From cb31c4a90fe2697e8baa186495ee602137adbbe5 Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Fri, 5 May 2023 12:50:34 +0100 Subject: [PATCH 1/4] ci(test): test on ruby 3.2 and x-plat --- .github/workflows/release_gem.yml | 2 +- .github/workflows/test.yml | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release_gem.yml b/.github/workflows/release_gem.yml index 484c1d4..dcc7aff 100644 --- a/.github/workflows/release_gem.yml +++ b/.github/workflows/release_gem.yml @@ -10,7 +10,7 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - id: release-gem diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c58a9e5..99b29c1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,16 +4,12 @@ on: [push, pull_request] jobs: test: - runs-on: "ubuntu-latest" - continue-on-error: ${{ matrix.experimental }} + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - ruby_version: ["2.2", "2.7"] - experimental: [false] - include: - - ruby_version: "3.0" - experimental: true + ruby_version: ["2.2", "2.7", "3.0", "3.2"] + os: ["ubuntu-latest","windows-latest","macos-latest"] steps: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 From 1e6194ac60e9703abca3fe76ca23e06195160e7f Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Fri, 5 May 2023 13:04:24 +0100 Subject: [PATCH 2/4] ci(chore): x-plat - skip cli tests on windows --- spec/features/cli_spec.rb | 2 +- spec/spec_helper.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/features/cli_spec.rb b/spec/features/cli_spec.rb index 6b9702d..a751541 100644 --- a/spec/features/cli_spec.rb +++ b/spec/features/cli_spec.rb @@ -3,7 +3,7 @@ require 'fileutils' require 'English' -RSpec.describe 'the CLI' do +RSpec.describe 'the CLI', skip_windows: true do CLI_SPEC_PACT_FILE_PATH = './tmp/foo-bar.json'.freeze let(:json) { File.read('spec/fixtures/message-v1-format.json') } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index fa326d1..24060b8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -5,7 +5,9 @@ config.example_status_persistence_file_path = ".rspec_status" config.disable_monkey_patching! + is_windows = Gem.win_platform? + config.filter_run_excluding :skip_windows => is_windows config.expect_with :rspec do |c| c.syntax = :expect end From 915c026d0dfc332e92635582b6cf1900b7c59782 Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Fri, 5 May 2023 13:17:26 +0100 Subject: [PATCH 3/4] ci(test): drop testing of ruby 2.2 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 99b29c1..e1f3976 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - ruby_version: ["2.2", "2.7", "3.0", "3.2"] + ruby_version: ["2.7", "3.0", "3.2"] os: ["ubuntu-latest","windows-latest","macos-latest"] steps: - uses: actions/checkout@v2 From 1601c95b87508a62e19be6e3ecbf2eff7a54627a Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Thu, 11 May 2023 17:17:43 +0100 Subject: [PATCH 4/4] ci: add ruby 3.1 to matrix --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e1f3976..16b565b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - ruby_version: ["2.7", "3.0", "3.2"] + ruby_version: ["2.7", "3.0", "3.1", "3.2"] os: ["ubuntu-latest","windows-latest","macos-latest"] steps: - uses: actions/checkout@v2