Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to rake-compiler-dock 1.6.0 #164

Closed
wants to merge 3 commits into from
Closed
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/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2"
ruby-version: "3.4.0-rc1"
- name: Upgrade all vendored dependencies to their latest versions
run: ./scripts/update-dependencies
- uses: actions/create-github-app-token@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2"
ruby-version: "3.4.0-rc1"
- run: gem install --no-document yard redcarpet
- run: yardoc
- uses: actions/upload-pages-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/precompile-gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.3"
ruby-version: "3.4.0-rc1"
bundler-cache: true
- uses: actions/cache@v4
with:
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: re2 Tests

concurrency:
group: "${{ github.workflow }}-${{ github.sha }}"
group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}"
cancel-in-progress: true

on:
Expand All @@ -27,7 +27,7 @@ jobs:
key: archives-ubuntu-${{ hashFiles('dependencies.yml') }}
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.3"
ruby-version: "3.4.0-rc1"
bundler-cache: true
- run: bundle exec rake gem
- uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
ruby: ["3.3", "2.6"] # oldest and newest
ruby: ["3.4.0-rc1", "2.6"] # oldest and newest
libre2:
- version: "20150501"
soname: 0
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"]
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4.0-rc1"]
sys: ["enable", "disable"]
runs-on: "ubuntu-latest"
steps:
Expand All @@ -151,7 +151,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"]
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4.0-rc1"]
sys: ["enable", "disable"]
runs-on: "macos-13"
steps:
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["3.1", "3.2", "3.3"]
ruby: ["3.1", "3.2", "3.3", "head"]
sys: ["enable", "disable"]
runs-on: "windows-2022"
steps:
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
- uses: ruby/setup-ruby@v1
id: setup-ruby
with:
ruby-version: "3.3"
ruby-version: "3.4.0-rc1"
bundler-cache: true
- uses: actions/download-artifact@v4
with:
Expand All @@ -264,7 +264,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4.0-rc1"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -285,7 +285,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4.0-rc1"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -306,7 +306,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4.0-rc1"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -327,7 +327,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4.0-rc1"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -348,7 +348,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4.0-rc1"]
runs-on: macos-14
steps:
- uses: actions/checkout@v4
Expand All @@ -369,7 +369,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4.0-rc1"]
runs-on: macos-13
steps:
- uses: actions/checkout@v4
Expand All @@ -390,7 +390,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["3.1", "3.2", "3.3"]
ruby: ["3.1", "3.2", "3.3", "head"]
runs-on: windows-2022
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -434,7 +434,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4.0-rc1"]
runs-on: ubuntu-latest
container:
image: "ruby:${{ matrix.ruby }}-alpine"
Expand All @@ -459,7 +459,7 @@ jobs:
key: archives-ubuntu-${{ hashFiles('dependencies.yml') }}
- uses: ruby/setup-ruby-pkgs@v1
with:
ruby-version: "3.3"
ruby-version: "3.4.0-rc1"
apt-get: valgrind
bundler-cache: true
- run: bundle exec rake spec:valgrind
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,7 @@ It supports the following RE2 ABI versions:
Where possible, a pre-compiled native gem will be provided for the following platforms:

* Linux
* `aarch64-linux` and `arm-linux` (requires [glibc](https://www.gnu.org/software/libc/) 2.29+)
* `x86-linux` and `x86_64-linux` (requires [glibc](https://www.gnu.org/software/libc/) 2.17+)
* `aarch64-linux`, `arm-linux`, `x86-linux` and `x86_64-linux` (requires [glibc](https://www.gnu.org/software/libc/) 2.29+)
* [musl](https://musl.libc.org/)-based systems such as [Alpine](https://alpinelinux.org) are supported as long as a [glibc-compatible library is installed](https://wiki.alpinelinux.org/wiki/Running_glibc_programs)
* macOS `x86_64-darwin` and `arm64-darwin`
* Windows `x64-mingw32` and `x64-mingw-ucrt`
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cross_platforms = %w[
x86_64-linux
].freeze

ENV['RUBY_CC_VERSION'] = %w[3.3.0 3.2.0 3.1.0 3.0.0 2.7.0 2.6.0].join(':')
ENV['RUBY_CC_VERSION'] = %w[3.4.0 3.3.5 3.2.0 3.1.0 3.0.0 2.7.0 2.6.0].join(':')

Gem::PackageTask.new(re2_gemspec).define

Expand Down
2 changes: 1 addition & 1 deletion re2.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Gem::Specification.new do |s|
"spec/re2/scanner_spec.rb"
]
s.add_development_dependency("rake-compiler", "~> 1.2.7")
s.add_development_dependency("rake-compiler-dock", "~> 1.5.2")
s.add_development_dependency("rake-compiler-dock", "~> 1.7.0.rc1")
s.add_development_dependency("rspec", "~> 3.2")
s.add_runtime_dependency("mini_portile2", "~> 2.8.7") # keep version in sync with extconf.rb
end
Loading