Skip to content

Commit

Permalink
Merge pull request #212 from gjtorikian/support-32
Browse files Browse the repository at this point in the history
Provide 3.2 build support
  • Loading branch information
gjtorikian authored Jan 8, 2023
2 parents f899ac5 + 8af6c97 commit ab585be
Show file tree
Hide file tree
Showing 13 changed files with 130 additions and 139 deletions.
5 changes: 5 additions & 0 deletions .cross_rubies
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@
3.1.0:x86_64-darwin
3.1.0:arm64-darwin
3.1.0:x64-mingw-ucrt
3.2.0:x86_64-linux
3.2.0:aarch64-linux
3.2.0:x86_64-darwin
3.2.0:arm64-darwin
3.2.0:x64-mingw-ucrt
11 changes: 5 additions & 6 deletions .github/workflows/cruby-build-and-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- uses: oxidize-rb/actions/setup-ruby-and-rust@main
with:
ruby-version: "3.1"
ruby-version: "3.2"
rubygems: latest
bundler-cache: false
cargo-cache: true
Expand All @@ -41,8 +41,7 @@ jobs:
- uses: oxidize-rb/cross-gem-action@main
with:
platform: ${{ matrix.platform }}
env: |
RUBY_CC_VERSION=3.1.0
ruby-versions: '3.1, 3.2'

- name: "Test gem build"
run: |
Expand All @@ -59,7 +58,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["3.1"]
ruby: ["3.1", "3.2"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -80,7 +79,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["3.1"]
ruby: ["3.1", "3.2"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -107,7 +106,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["3.1"]
ruby: ["3.1", "3.2"]
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/generic-build-and-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: oxidize-rb/actions/setup-ruby-and-rust@main
with:
ruby-version: "3.1"
ruby-version: "3.2"
rubygems: latest
bundler-cache: false
cargo-cache: true
Expand All @@ -28,8 +28,7 @@ jobs:
- uses: oxidize-rb/cross-gem-action@main
with:
platform: x86_64-linux
env: |
RUBY_CC_VERSION=3.1.0
ruby-versions: '3.1, 3.2'

- run: ./script/test-gem-build gems ruby

Expand All @@ -42,12 +41,15 @@ jobs:
generic-linux-install:
needs: ["generic-package"]
runs-on: ubuntu-latest
strategy:
matrix:
ruby: ["3.1", "3.2"]
steps:
- uses: actions/checkout@v3

- uses: ruby/setup-ruby-pkgs@v1
with:
ruby-version: "3.1"
ruby-version: "${{matrix.ruby}}"

- uses: actions/download-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1
ruby-version: 3.2
rubygems: latest
bundler-cache: true # 'bundle install' and cache
- name: Rubocop
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/tag_and_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- uses: oxidize-rb/actions/setup-ruby-and-rust@main
with:
ruby-version: "3.1"
ruby-version: "3.2"
rubygems: latest
bundler-cache: false
cargo-cache: true
Expand All @@ -36,8 +36,7 @@ jobs:
- uses: oxidize-rb/cross-gem-action@main
with:
platform: ${{ matrix.platform }}
env: |
RUBY_CC_VERSION=3.1.0
ruby-versions: '3.1, 3.2'

- uses: actions/download-artifact@v3
with:
Expand Down Expand Up @@ -72,11 +71,11 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set up Ruby 3.1
- name: Set up Ruby 3.2
uses: ruby/setup-ruby@v1
with:
rubygems: latest
ruby-version: 3.1
ruby-version: 3.2
bundler-cache: true

- name: Configure Git
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- macos-latest
- windows-latest
ruby:
- 3.1
- 3.2

steps:
- uses: actions/checkout@v3
Expand Down
Loading

0 comments on commit ab585be

Please sign in to comment.