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
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3
uses: github/codeql-action/autobuild@v4

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v4
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
release:
if: github.repository == 'sporkmonger/addressable'
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
permissions:
id-token: write # for trusted publishing
steps:
Expand All @@ -19,7 +19,7 @@ jobs:
- name: Install libidn
run: sudo apt-get install libidn11-dev

- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: ruby/setup-ruby@v1
with:
Expand Down
49 changes: 25 additions & 24 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [2.7]
ruby: [ruby]
idna_mode: [native, pure]
os: [ubuntu-22.04]
os: [ubuntu-latest]
env:
IDNA_MODE: ${{ matrix.idna_mode }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Install libidn
run: sudo apt-get install libidn11-dev
Expand All @@ -45,16 +45,16 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [2.7]
os: [ubuntu-22.04]
ruby: [ruby]
os: [ubuntu-latest]
env:
BUNDLE_WITHOUT: development
COVERALLS_SERVICE_NAME: github
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_DEBUG: true
CI_BUILD_NUMBER: ${{ github.run_id }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Install libidn
run: sudo apt-get install libidn11-dev
Expand Down Expand Up @@ -88,32 +88,33 @@ jobs:
- 3.1
- 3.2
- 3.3
- jruby-9.1
- jruby-9.2
- jruby-9.3
- 3.4
- jruby-9.4
- truffleruby-22.2
- truffleruby-22.3
- jruby-10.0
- truffleruby-24
- truffleruby-25
os:
- ubuntu-22.04
- ubuntu-24.04
gemfile:
- Gemfile
include:
- { os: ubuntu-22.04, ruby: 2.7, gemfile: gemfiles/public_suffix_2.rb }
- { os: ubuntu-22.04, ruby: 2.7, gemfile: gemfiles/public_suffix_3.rb }
- { os: ubuntu-22.04, ruby: 2.7, gemfile: gemfiles/public_suffix_4.rb }
- { os: ubuntu-24.04, ruby: 2.7, gemfile: gemfiles/public_suffix_2.rb }
- { os: ubuntu-24.04, ruby: 2.7, gemfile: gemfiles/public_suffix_3.rb }
- { os: ubuntu-24.04, ruby: 2.7, gemfile: gemfiles/public_suffix_4.rb }
- { os: ubuntu-24.04, ruby: 3.1, gemfile: gemfiles/public_suffix_5.rb }
# Ubuntu
- { os: ubuntu-22.04, ruby: 3.1 }
- { os: ubuntu-22.04, ruby: ruby }
# macOS
- { os: macos-13, ruby: 3.1 }
- { os: macos-14, ruby: ruby } # arm64
- { os: macos-15, ruby: ruby } # arm64
- { os: macos-15-intel, ruby: ruby } # EoL August 2027 (https://github.com/actions/runner-images/issues/13046)
# Windows
- { os: windows-2019, ruby: 3.1 }
- { os: windows-2022, ruby: 3.1 }
- { os: windows-2022, ruby: jruby-9.3 }
- { os: windows-2022, ruby: ruby }
- { os: windows-2022, ruby: jruby }
# allowed to fail
- { os: ubuntu-22.04, ruby: head, gemfile: Gemfile, allow-failure: true }
- { os: ubuntu-22.04, ruby: jruby-head, gemfile: Gemfile, allow-failure: true }
- { os: ubuntu-22.04, ruby: truffleruby-head, gemfile: Gemfile, allow-failure: true }
- { os: ubuntu-24.04, ruby: head, gemfile: Gemfile, allow-failure: true }
- { os: ubuntu-24.04, ruby: jruby-head, gemfile: Gemfile, allow-failure: true }
- { os: ubuntu-24.04, ruby: truffleruby-head, gemfile: Gemfile, allow-failure: true }
env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
BUNDLE_WITHOUT: development:coverage
Expand All @@ -122,7 +123,7 @@ jobs:
# https://github.com/jruby/jruby/issues/7182#issuecomment-1112953015
JAVA_OPTS: -Djdk.io.File.enableADS=true
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Install libidn (Ubuntu)
if: startsWith(matrix.os, 'ubuntu')
Expand Down
6 changes: 6 additions & 0 deletions gemfiles/public_suffix_5.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# frozen_string_literal: true

# Assumes this gemfile is used from the project root
eval_gemfile "../Gemfile"

gem "public_suffix", "~> 5.0"
3 changes: 2 additions & 1 deletion spec/addressable/uri_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6816,9 +6816,10 @@ def to_str
describe Addressable::URI, "when initialized in a non-main `Ractor`" do
it "should have the same value as if used in the main `Ractor`" do
pending("Ruby 3.0+ for `Ractor` support") unless defined?(Ractor)
value_method = RUBY_VERSION >= "3.5.0" ? :value : :take # see https://github.com/ruby/ruby/pull/13445
main = Addressable::URI.parse("http://example.com")
expect(
Ractor.new { Addressable::URI.parse("http://example.com") }.take
Ractor.new { Addressable::URI.parse("http://example.com") }.public_send(value_method)
).to eq(main)
end
end
Expand Down
2 changes: 1 addition & 1 deletion tasks/profile.rake
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace :profile do
puts "\n\n"

if ENV["CI"]
report.pretty_print(print_options)
report.pretty_print(**print_options)
else
t_allocated = report.scale_bytes(report.total_allocated_memsize)
t_retained = report.scale_bytes(report.total_retained_memsize)
Expand Down