Merge pull request #267 from gjtorikian/rb-3

Support Ruby 3.3
gjtorikian · Dec 28, 2023 · 8226b15 · 8226b15
2 parents 2df7927 + ae1c971
commit 8226b15
Show file tree

Hide file tree

Showing 7 changed files with 272 additions and 133 deletions.
diff --git a/.github/workflows/cruby-build-and-install.yml b/.github/workflows/cruby-build-and-install.yml
@@ -11,10 +11,8 @@ on:
 
 env:
   CACHE_KEY_PREFIX: "cruby-v1"
-
-# "3.1,3.2" # SUPPORTED_RUBY_VERSIONS
-# ["3.1", "3.2"] # SUPPORTED_RUBY_MATRIX
-# "3.2" # LATEST_RUBY_VERSION
+  SUPPORTED_RUBY_VERSIONS: "3.1,3.2,3.3"
+  LATEST_RUBY_VERSION: "3.3"
 
 jobs:
   cruby-package:
@@ -37,15 +35,15 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2" # LATEST_RUBY_VERSION
+          ruby-version: "${{ env.LATEST_RUBY_VERSION }}"
 
       - uses: oxidize-rb/actions/cross-gem@main
         id: cross-gem
         with:
           platform: ${{ matrix.platform }}
-          ruby-versions: "3.1,3.2" # SUPPORTED_RUBY_VERSIONS
+          ruby-versions: "${{ env.SUPPORTED_RUBY_VERSIONS }}"
 
       - uses: oxidize-rb/actions/test-gem-build@main
         with:
           platform: ${{ matrix.platform }}
-          ruby-versions: "3.1,3.2" # SUPPORTED_RUBY_VERSIONS
+          ruby-versions: "${{ env.SUPPORTED_RUBY_VERSIONS }}"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 3.3
           rubygems: latest
           bundler-cache: true # 'bundle install' and cache
       - name: Rubocop
@@ -26,13 +26,13 @@ jobs:
         rust:
           - stable
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-    - name: Obtain Rust
-      run: rustup override set ${{ matrix.rust }}
+      - name: Obtain Rust
+        run: rustup override set ${{ matrix.rust }}
 
-    - name: Check clippy
-      run: rustup component add clippy && cargo clippy
+      - name: Check clippy
+        run: rustup component add clippy && cargo clippy
 
-    - name: Check formatting
-      run: rustup component add rustfmt && cargo fmt -- --check
+      - name: Check formatting
+        run: rustup component add rustfmt && cargo fmt -- --check
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,15 +12,13 @@ jobs:
           - ubuntu-latest
           - macos-latest
           - windows-latest
-        ruby:
-          - 3.2
 
     steps:
       - uses: actions/checkout@v4
 
       - uses: oxidize-rb/actions/setup-ruby-and-rust@main
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: 3.3
           rubygems: latest
           bundler-cache: true
           cargo-cache: true

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.1
+3.3.0