From 451fb9f98b982183409aaff85f92dfb497ee168d Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Sun, 26 Dec 2021 22:51:26 +0900 Subject: [PATCH 1/3] CI against Ruby 3.1 * Ruby 3.1.0 Released https://www.ruby-lang.org/en/news/2021/12/25/ruby-3-1-0-released/ --- .github/workflows/rubocop.yml | 4 ++-- .github/workflows/test.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 227aacef..6b935af6 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Set up Ruby 2.6 + - name: Set up Ruby 3.1 uses: actions/setup-ruby@v1 with: - ruby-version: 2.6.x + ruby-version: 3.1.x - name: Install required package run: | sudo apt-get install alien diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0dbff002..2a31b07a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,6 +12,7 @@ jobs: strategy: matrix: ruby: [ + 3.1, 3.0, 2.7, 2.6, From 3bf01c8a794bc0d2c815bf8a3ca237f83b861bb5 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Wed, 29 Dec 2021 09:40:33 +0900 Subject: [PATCH 2/3] Quote Ruby versions not to float 3.1 as handled as integer 3 https://github.com/actions/runner/issues/849 --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2a31b07a..e8e1e0c5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,11 +12,11 @@ jobs: strategy: matrix: ruby: [ - 3.1, - 3.0, - 2.7, - 2.6, - 2.5, + '3.1', + '3.0', + '2.7', + '2.6', + '2.5', ruby-head, ruby-debug ] From b7706bb329553e71ad107720a13d8c4992ce56af Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Thu, 30 Dec 2021 09:03:07 +0900 Subject: [PATCH 3/3] Support Ruby 3.2.0dev which removed `File.exists?` Refer https://github.com/kubo/ruby-oci8/pull/242 --- Gemfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f242676e..e57697dd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,7 @@ source "http://rubygems.org" +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + group :development do gem "juwelier", "~> 2.0" gem "rspec_junit_formatter" @@ -19,6 +21,10 @@ group :test, :development do end platforms :ruby, :mswin, :mingw do - gem "ruby-oci8", "~> 2.1" + if RUBY_VERSION >= "3.2" + gem "ruby-oci8", github: "kubo/ruby-oci8", branch: "master" + else + gem "ruby-oci8", "~> 2.1" + end end end