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
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ jobs:
ruby: "3.4"
flags: "--test --cucumber"
- os: ubuntu-latest
ruby: "3.4"
ruby: "4.0"
flags: "--test --cucumber"
- os: ubuntu-latest
ruby: "4.0"
flags: "--rubocop --yard --build"
- os: ubuntu-latest
ruby: jruby
Expand All @@ -44,10 +47,10 @@ jobs:
# ruby: truffleruby
# flags: "--test --cucumber"
- os: macos-latest
ruby: "3.4"
ruby: "4.0"
flags: "--test --cucumber"
- os: windows-latest
ruby: "3.4"
ruby: "4.0"
flags: "--test --cucumber"
fail-fast: false
runs-on: ${{ matrix.os }}
Expand All @@ -57,7 +60,7 @@ jobs:
with:
ruby-version: ${{ matrix.ruby }}
- name: Checkout repo
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Install dependencies
shell: bash
run: "bundle install && gem install --no-document toys"
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/release-hook-on-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,14 @@ permissions:
jobs:
release-process-request:
if: ${{ github.repository == 'cloudevents/sdk-ruby' }}
env:
ruby_version: "3.4"
runs-on: ubuntu-latest
steps:
- name: Install Ruby ${{ env.ruby_version }}
- name: Install Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.ruby_version }}
ruby-version: "4.0"
- name: Checkout repo
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Install Toys
run: "gem install --no-document toys"
- name: Process release request
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/release-hook-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,14 @@ permissions:
jobs:
release-update-open-requests:
if: ${{ github.repository == 'cloudevents/sdk-ruby' }}
env:
ruby_version: "3.4"
runs-on: ubuntu-latest
steps:
- name: Install Ruby ${{ env.ruby_version }}
- name: Install Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.ruby_version }}
ruby-version: "4.0"
- name: Checkout repo
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Install Toys
run: "gem install --no-document toys"
- name: Update open releases
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/release-perform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,14 @@ permissions:
jobs:
release-perform:
if: ${{ github.repository == 'cloudevents/sdk-ruby' }}
env:
ruby_version: "3.4"
runs-on: ubuntu-latest
steps:
- name: Install Ruby ${{ env.ruby_version }}
- name: Install Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.ruby_version }}
ruby-version: "4.0"
- name: Checkout repo
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Install Toys
run: "gem install --no-document toys"
- name: Perform release
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/release-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,14 @@ permissions:
jobs:
release-request:
if: ${{ github.repository == 'cloudevents/sdk-ruby' }}
env:
ruby_version: "3.4"
runs-on: ubuntu-latest
steps:
- name: Install Ruby ${{ env.ruby_version }}
- name: Install Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.ruby_version }}
ruby-version: "4.0"
- name: Checkout repo
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Install Toys
run: "gem install --no-document toys"
- name: Open release pull request
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/release-retry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,14 @@ permissions:
jobs:
release-retry:
if: ${{ github.repository == 'cloudevents/sdk-ruby' }}
env:
ruby_version: "3.4"
runs-on: ubuntu-latest
steps:
- name: Install Ruby ${{ env.ruby_version }}
- name: Install Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.ruby_version }}
ruby-version: "4.0"
- name: Checkout repo
uses: actions/checkout@v5
uses: actions/checkout@v6
- name: Install Toys
run: "gem install --no-document toys"
- name: Retry release
Expand Down
2 changes: 2 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,8 @@ Style/MethodCallWithArgsParentheses:
Enabled: true
Style/MinMaxComparison:
Enabled: true
Style/ModuleMemberExistenceCheck:
Enabled: true
Style/MultilineInPatternThen:
Enabled: true
Style/NegatedIfElseCondition:
Expand Down
4 changes: 2 additions & 2 deletions .toys/.toys.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

toys_version! ">= 0.17"
toys_version! ">= 0.19"

expand :clean, paths: :gitignore

Expand All @@ -19,4 +19,4 @@

expand :gem_build, name: "install", install_gem: true

load_gem "toys-release", version: "~> 0.2", as: "release"
load_gem "toys-release", version: "~> 0.4", as: "release"
2 changes: 1 addition & 1 deletion .toys/ci.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
expand("toys-ci") do |toys_ci|
toys_ci.only_flag = true
toys_ci.fail_fast_flag = true
toys_ci.job("Bundle update", flag: :bundle, exec: ["bundle", "update"])
toys_ci.job("Bundle update", flag: :bundle, exec: ["bundle", "update", "--all"])
toys_ci.job("Rubocop", flag: :rubocop, tool: ["rubocop"])
toys_ci.job("Tests", flag: :test, tool: ["test"])
toys_ci.job("Cucumber", flag: :cucumber, tool: ["cucumber"])
Expand Down
14 changes: 9 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@ source "https://rubygems.org"
gemspec

gem "cucumber", "~> 9.2"
gem "logger", "~> 1.4"
gem "minitest", "~> 5.25"
gem "minitest", ">= 5.26", "< 7"
gem "minitest-focus", "~> 1.4"
gem "minitest-rg", "~> 5.3"
gem "rack", "~> 3.2"
gem "redcarpet", "~> 3.6" unless ::RUBY_PLATFORM == "java"
gem "rubocop", "~> 1.81"
gem "toys-core", "~> 0.17"
gem "rubocop", "~> 1.82"
gem "toys-core", "~> 0.19"
gem "webrick", "~> 1.9"
gem "yard", "~> 0.9.37"
# win32ole is required transitively by cucumber via sys-uname, and not declared
# as a dependency as of sys-uname 1.4.1. But it is no longer a default gem as
# of Ruby 4.0, and so must be included explicitly in the Gemfile for now. This
# can be removed once sys-uname gets fixed.
gem "win32ole", "~> 1.9" if ::RbConfig::CONFIG["host_os"] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
gem "yard", "~> 0.9.38"
Loading