From fdc21b15341892d115bd34beda0ce97254658bef Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Mon, 25 Dec 2023 21:09:55 -0500 Subject: [PATCH] ci: update pipelines to test with ruby 3.3 final --- .github/workflows/ci.yml | 42 +++++++++++++++++----------------- .github/workflows/upstream.yml | 6 ++--- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2759979f3d..a6b11853a02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: rubocop: runs-on: ubuntu-latest container: - image: ghcr.io/sparklemotion/nokogiri-test:mri-3.2 + image: ghcr.io/sparklemotion/nokogiri-test:mri-3.3 steps: - uses: actions/checkout@v4 with: @@ -69,7 +69,7 @@ jobs: submodules: true - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.2" + ruby-version: "3.3" bundler-cache: true bundler: latest - run: bundle exec rake gumbo:test @@ -98,7 +98,7 @@ jobs: fail-fast: false matrix: sys: ["enable", "disable"] - ruby: ["3.0", "3.1", "3.2", "3.3-rc"] + ruby: ["3.0", "3.1", "3.2", "3.3"] runs-on: ubuntu-latest container: image: ghcr.io/sparklemotion/nokogiri-test:mri-${{matrix.ruby}} @@ -122,11 +122,11 @@ jobs: fail-fast: false matrix: sys: ["enable", "disable"] - ruby: ["3.0", "3.1", "3.2"] + ruby: ["3.0", "3.1", "3.2", "3.3"] mem: ["ruby"] include: - sys: "disable" - ruby: "3.2" + ruby: "3.3" mem: "default" runs-on: ubuntu-latest container: @@ -188,7 +188,7 @@ jobs: fail-fast: false matrix: sys: ["enable"] - ruby: ["3.2"] + ruby: ["3.3"] env: BUNDLE_GEMFILE: "Gemfile-libxml-ruby" runs-on: ubuntu-latest @@ -213,7 +213,7 @@ jobs: fail-fast: false matrix: sys: ["disable"] - ruby: ["3.2"] + ruby: ["3.3"] env: BUNDLE_GEMFILE: "Gemfile-libxml-ruby" runs-on: ubuntu-latest @@ -238,7 +238,7 @@ jobs: fail-fast: false matrix: sys: ["enable", "disable"] - ruby: ["3.0", "3.1", "3.2", "3.3.0-rc1"] + ruby: ["3.0", "3.1", "3.2", "3.3"] runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -263,7 +263,7 @@ jobs: fail-fast: false matrix: sys: ["enable", "disable"] - ruby: ["3.0", "3.1", "3.2", "head", "mingw"] + ruby: ["3.0", "3.1", "3.2", "3.3", "mingw"] runs-on: windows-2022 steps: - name: configure git crlf @@ -364,7 +364,7 @@ jobs: fail-fast: false matrix: sys: ["disable"] - ruby: ["3.2"] + ruby: ["3.3"] runs-on: ubuntu-latest container: image: ghcr.io/sparklemotion/nokogiri-test:mri-${{matrix.ruby}} @@ -387,7 +387,7 @@ jobs: fail-fast: false matrix: sys: ["disable"] - ruby: ["3.2"] + ruby: ["3.3"] runs-on: ubuntu-latest container: image: ghcr.io/sparklemotion/nokogiri-test:mri-${{matrix.ruby}} @@ -416,7 +416,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.2" + ruby-version: "3.3" bundler-cache: true bundler: latest - id: rcd_image_version @@ -452,7 +452,7 @@ jobs: fail-fast: false matrix: sys: ["enable", "disable"] - ruby: ["3.0", "3.1", "3.2", "head"] + ruby: ["3.0", "3.1", "3.2", "3.3"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -474,7 +474,7 @@ jobs: fail-fast: false matrix: sys: ["enable", "disable"] - ruby: ["3.0", "3.1", "3.2", "head"] + ruby: ["3.0", "3.1", "3.2", "3.3"] runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -518,7 +518,7 @@ jobs: fail-fast: false matrix: sys: ["enable", "disable"] - ruby: ["3.1", "3.2", "head"] + ruby: ["3.1", "3.2", "3.3"] runs-on: windows-2022 steps: - uses: actions/checkout@v4 @@ -577,7 +577,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3.0-rc1"] + ruby: ["3.0", "3.1", "3.2", "3.3"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -599,7 +599,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3.0-rc1"] + ruby: ["3.0", "3.1", "3.2", "3.3"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -621,7 +621,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3.0-rc1"] + ruby: ["3.0", "3.1", "3.2", "3.3"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -643,7 +643,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "head"] + ruby: ["3.0", "3.1", "3.2", "3.3"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -680,7 +680,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "head"] + ruby: ["3.0", "3.1", "3.2", "3.3"] runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -721,7 +721,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.1", "3.2", "head"] + ruby: ["3.1", "3.2", "3.3"] runs-on: windows-2022 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml index 197af4df0df..7822501b7eb 100644 --- a/.github/workflows/upstream.yml +++ b/.github/workflows/upstream.yml @@ -31,7 +31,7 @@ jobs: submodules: true - uses: ruby/setup-ruby-pkgs@v1 with: - ruby-version: "3.2" + ruby-version: "3.3" apt-get: "autogen libtool shtool" brew: "automake autogen libtool shtool" mingw: "autotools" @@ -164,7 +164,7 @@ jobs: html5lib-tests: runs-on: ubuntu-latest container: - image: ghcr.io/sparklemotion/nokogiri-test:mri-3.2 + image: ghcr.io/sparklemotion/nokogiri-test:mri-3.3 steps: - uses: actions/checkout@v4 with: @@ -172,7 +172,7 @@ jobs: - uses: actions/cache@v3 with: path: ports - key: ports-ubuntu-3.2-${{hashFiles('dependencies.yml', 'patches/**/*.patch', 'ext/nokogiri/extconf.rb')}} + key: ports-ubuntu-3.3-${{hashFiles('dependencies.yml', 'patches/**/*.patch', 'ext/nokogiri/extconf.rb')}} - name: Update html5lib-tests run: | cd test/html5lib-tests