Skip to content

Commit

Permalink
ci: windows 3.4 is still not available, use head
Browse files Browse the repository at this point in the history
and jruby-head is still failing, skip rdoc/psych entirely
  • Loading branch information
flavorjones committed Dec 27, 2024
1 parent 3ca18ef commit 5d3f247
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
submodules: true
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.4"
ruby-version: "3.3"
bundler-cache: true
bundler: latest
- run: bundle exec rake gumbo:test
Expand Down Expand Up @@ -97,6 +97,7 @@ jobs:
outputs:
# these are usually the same, but are different once we get to ruby release candidates
setup_ruby: "['3.1', '3.2', '3.3', '3.4']"
setup_ruby_win: "['3.1', '3.2', '3.3', 'head']"
image_tag: "['3.1', '3.2', '3.3', '3.4']"
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -321,7 +322,7 @@ jobs:
fail-fast: false
matrix:
sys: ["enable", "disable"]
ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby_win) }}
runs-on: windows-2022
steps:
- name: configure git crlf
Expand Down Expand Up @@ -541,7 +542,7 @@ jobs:
fail-fast: false
matrix:
sys: ["enable", "disable"]
ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby_win) }}
runs-on: windows-2022
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -687,7 +688,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby_win) }}
runs-on: windows-2022
steps:
- uses: actions/checkout@v4
Expand Down
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ end
# If Psych doesn't build, you can disable this group locally by running
# `bundle config set --local without rdoc`
# Then re-run `bundle install`.
group :rdoc do
gem "rdoc", "6.10.0"
gem "jar-dependencies", "0.4.1" if RUBY_PLATFORM == "java" # https://github.com/jruby/jruby/issues/7262
unless RUBY_PLATFORM == "java" # see #3391 and https://github.com/jruby/jruby/issues/7262
group :rdoc do
gem "rdoc", "6.10.0"
end
end

0 comments on commit 5d3f247

Please sign in to comment.