Skip to content

Commit 5b65a4e

Browse files
djberg96sferik
authored andcommitted
Add Windows to platforms for oj and yajl.
1 parent c0c8c68 commit 5b65a4e

2 files changed

Lines changed: 24 additions & 33 deletions

File tree

.github/workflows/ci.yml

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,34 @@
1-
name: Test
1+
name: Ruby
22

33
on:
44
push:
55
branches: [main, master] # TODO: rename and get rid of 'master'
6-
# Triggers the workflow on pull request events.
6+
paths-ignore:
7+
- '**/*.md'
78
pull_request:
8-
types: [opened, reopened, synchronize]
9-
# Allows you to run this workflow manually from the Actions tab
9+
branches: [main, master] # TODO: rename and get rid of 'master'
10+
paths-ignore:
11+
- '**/*.md'
1012
workflow_dispatch:
1113

12-
# This allows a subsequently queued workflow run to interrupt previous runs.
13-
concurrency:
14-
group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
15-
cancel-in-progress: true
16-
1714
jobs:
1815
test:
19-
runs-on: ubuntu-latest
2016
strategy:
2117
matrix:
22-
ruby:
23-
# https://www.ruby-lang.org/en/downloads/branches/
24-
- "ruby-3.0"
25-
- "ruby-3.1"
26-
- "ruby-3.2"
27-
- "ruby-3.3"
28-
- "ruby-head"
29-
# https://github.com/jruby/jruby/discussions/7915
30-
- "jruby-9.4"
31-
- "jruby-head"
32-
name: "Test (Ruby ${{ matrix.ruby }})"
33-
env:
34-
SKIP_ADAPTERS: jr_jackson,nsjsonserialization,json_pure
18+
ruby-version: ['3.0', '3.1', '3.2', 'jruby']
19+
platform: [ubuntu-latest, macos-latest, windows-latest]
20+
runs-on: ${{ matrix.platform }}
21+
3522
steps:
36-
- uses: actions/checkout@v4
37-
- name: Set up Ruby
38-
uses: ruby/setup-ruby@v1
39-
with:
40-
ruby-version: ${{ matrix.ruby }}
41-
bundler-cache: true
42-
- run: bundle install
43-
- run: bundle exec rake
23+
- uses: actions/checkout@v4
24+
- name: Set up Ruby
25+
uses: ruby/setup-ruby@v1
26+
with:
27+
ruby-version: ${{ matrix.ruby-version }}
28+
bundler-cache: false # Do not bundle install yet, need recent versions for Windows
29+
- name: Run tests
30+
run: |
31+
gem install bundler
32+
bundle install
33+
bundle exec rake
34+

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ gem "standard", ">= 1.35.1"
1313

1414
gem "gson", ">= 0.6", platforms: [:jruby], require: false
1515
gem "jrjackson", ">= 0.4.18", platforms: [:jruby], require: false
16-
gem "oj", "~> 3.0", platforms: [:ruby], require: false
17-
gem "yajl-ruby", "~> 1.3", platforms: [:ruby], require: false
16+
gem "oj", "~> 3.0", platforms: [:ruby, :windows], require: false
17+
gem "yajl-ruby", "~> 1.3", platforms: [:ruby, :windows], require: false
1818

1919
gemspec

0 commit comments

Comments
 (0)