Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/fuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run:
working-directory: ext/nosj
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.4"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
standardrb:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- uses: ruby/setup-ruby@v1
with:
Expand All @@ -27,7 +27,7 @@ jobs:
rbs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- uses: ruby/setup-ruby@v1
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
tag: ${{ steps.version.outputs.tag }}
version: ${{ steps.version.outputs.version }}
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Read version
id: version
Expand All @@ -52,7 +52,7 @@ jobs:
needs: version
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
ref: ${{ github.sha }}

Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
env:
SKIP_PGO: ${{ matrix.skip_pgo || '' }}
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
ref: ${{ github.sha }}

Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
- { platform: aarch64-linux-musl, os: ubuntu-24.04-arm }
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
ref: ${{ github.sha }}

Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:
}
runs-on: ${{ matrix.runs_on }}
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
ref: ${{ github.sha }}
sparse-checkout: script/ci/smoke.rb
Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
contents: write
id-token: write
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
ref: ${{ github.sha }}

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
ruby: ["3.3", "3.4", "4.0"]

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Set up Ruby & Rust
uses: oxidize-rb/actions/setup-ruby-and-rust@v1
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
NOSJ_JSON_VERSION: ${{ matrix.json }}

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Set up Ruby & Rust
uses: oxidize-rb/actions/setup-ruby-and-rust@v1
Expand All @@ -86,8 +86,8 @@ jobs:
- name: Run the Rails-facing specs
run: bundle exec rspec spec/rails_spec.rb spec/rails_integration_spec.rb spec/json_dropin_spec.rb

# The whole suite against json 3 (the main matrix runs the locked json
# 2.x): the drop-in follows whichever is installed, and the parity
# The whole suite against json 2 (the main matrix runs the locked json
# 3.x): the drop-in follows whichever is installed, and the parity
# specs compare against it.
json-compat:
name: json ${{ matrix.json }} on Ruby ${{ matrix.ruby }}
Expand All @@ -96,21 +96,21 @@ jobs:
fail-fast: false
matrix:
include:
- { json: "~> 3.0", ruby: "3.3" }
- { json: "~> 3.0", ruby: "4.0" }
- { json: "< 3", ruby: "3.3" }
- { json: "< 3", ruby: "4.0" }
env:
NOSJ_JSON_VERSION: ${{ matrix.json }}

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Set up Ruby & Rust
uses: oxidize-rb/actions/setup-ruby-and-rust@v1
with:
ruby-version: ${{ matrix.ruby }}
cargo-cache: true

# The committed lockfile pins json 2.x; the pin needs a fresh
# The committed lockfile pins json 3.x; the pin needs a fresh
# resolution.
- name: Bundle with the pinned json
run: |
Expand Down
36 changes: 18 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ group :test do
gem "actionpack", *[rails_pin].compact
end

# Pinnable for CI's json-compat matrix (e.g. "~> 3.0"): the drop-in
# follows whichever json is installed. A pinned run leaves out standard,
# whose rubocop requires json 2.x.
# Pinnable for CI's json-compat and rails-compat matrices (e.g. "< 3"):
# the drop-in follows whichever json is installed.
json_pin = ENV.fetch("NOSJ_JSON_VERSION", nil)
gem "json", json_pin if json_pin

group :development do
gem "standard", "~> 1.3" unless json_pin
# 1.57 is the first standard whose rubocop accepts json 3.
gem "standard", "~> 1.57"
gem "rbs", "~> 4.0"
gem "yard", "~> 0.9"
gem "lefthook", "~> 2.1"
Expand Down
Loading
Loading