Skip to content

Commit ccacd6b

Browse files
authored
Fix: update workflow configs to drop ruby 3.0 (#220)
* Fix: update workflow configs to drop ruby 3.0 * fix test expected error message * fix test expected error message * fix test expected error message * fix test expected error message * add more ruby versions to windows test to see if they also fail * add ruby 3.4 to coverage, use 3.2 for windows unit tests * add 'gem base64' to gemfile
1 parent 6a537ac commit ccacd6b

File tree

7 files changed

+13
-12
lines changed

7 files changed

+13
-12
lines changed

.github/workflows/buildpack-integration-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ jobs:
2323
cloudevent-builder-source: 'test/conformance'
2424
cloudevent-builder-target: 'cloudevent_func'
2525
prerun: ${{format('test/conformance/prerun.sh {0} testdata/conformance/function', github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha )}}
26-
builder-runtime: 'ruby30'
27-
builder-runtime-version: '3.0'
26+
builder-runtime: 'ruby31'
27+
builder-runtime-version: '3.1'

.github/workflows/conformance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
ruby: ['3.0', '3.1', '3.2', '3.3']
19+
ruby: ['3.1', '3.2', '3.3', '3.4']
2020
steps:
2121
- name: Harden Runner
2222
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
@@ -71,4 +71,4 @@ jobs:
7171
useBuildpacks: false
7272
validateConcurrency: true
7373
cmd: "'bundle exec functions-framework-ruby --source test/conformance/app.rb --target concurrent_http_func --signature-type http'"
74-
74+

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
2929
- name: Checkout repo
3030
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
31-
- name: Install Ruby 3.0
31+
- name: Install Ruby 3.1
3232
uses: ruby/setup-ruby@6c79f721fa26dd64559c2700086ac852c18e0756 # v1.225.0
3333
with:
34-
ruby-version: "3.0"
34+
ruby-version: "3.1"
3535
bundler-cache: true
3636
- name: Install toys
3737
run: gem install --no-document toys

.github/workflows/push-gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions: read-all
1010
jobs:
1111
push-gh-pages:
1212
env:
13-
ruby_version: "3.0"
13+
ruby_version: "3.1"
1414
runs-on: ubuntu-latest
1515

1616
permissions:

.github/workflows/unit.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
os: [ubuntu-latest]
19-
ruby: ['3.0', '3.1', '3.2', '3.3']
19+
ruby: ['3.1', '3.2', '3.3', '3.4']
2020
flags: ["--only --test-unit"]
2121
include:
2222
- os: ubuntu-latest
@@ -26,13 +26,13 @@ jobs:
2626
ruby: truffleruby
2727
flags: "--only --test-unit"
2828
- os: macos-latest
29-
ruby: "3.0"
29+
ruby: "3.1"
3030
flags: "--only --test-unit"
3131
- os: windows-latest
32-
ruby: "3.0"
32+
ruby: "3.2" # 3.1 fails similar to https://github.com/rubygems/rubygems/issues/4338
3333
flags: "--only --test-unit"
3434
- os: ubuntu-latest
35-
ruby: "3.0"
35+
ruby: "3.1"
3636
flags: "--only --test-yardoc --test-build --test-examples"
3737
fail-fast: false
3838
runs-on: ${{ matrix.os }}

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ source "https://rubygems.org"
1616

1717
gemspec
1818

19+
gem "base64"
1920
gem "google-style", "~> 1.30.1"
2021
gem "minitest", "~> 5.16"
2122
gem "minitest-focus", "~> 1.2"

test/test_server.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def query_server_with_retry server
203203
end
204204

205205
assert_equal "400", response.code
206-
assert_equal "unexpected token at 'not json'", response.body
206+
assert_match(/unexpected token/, response.body)
207207
assert_equal "text/plain; charset=utf-8", response["Content-Type"]
208208
end
209209

0 commit comments

Comments
 (0)