From dd9bd0a241ec1b17214d7b3ea69048c82db43a6f Mon Sep 17 00:00:00 2001 From: swiknaba Date: Wed, 13 Jan 2021 10:04:55 +0100 Subject: [PATCH 1/6] addds ruby 3 to CI matrix --- .github/workflows/ci.yml | 1 + .gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5240776..0de7abf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,7 @@ jobs: - "2.5" - "2.6" - "2.7" + - "3.0" steps: - uses: actions/checkout@v2 - name: Set up Ruby diff --git a/.gitignore b/.gitignore index 1d5d65a..3e3b4c2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ pkg/* .powder tmp bin +.ruby-version From 08bcd605d6724cd2a7cbcde0ad384bd3480792f6 Mon Sep 17 00:00:00 2001 From: swiknaba Date: Wed, 13 Jan 2021 10:17:11 +0100 Subject: [PATCH 2/6] use action cache instead of action checkout cache --- .github/workflows/ci.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0de7abf..a0a76f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,19 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - bundler-cache: true - - name: Install dependencies - run: bundle install + + - uses: actions/cache@v2 + with: + path: vendor/bundle + key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + ${{ runner.os }}-gems- + + - name: bundle install + run: | + gem install bundler + bundle config path vendor/bundle + bundle install -j $(getconf _NPROCESSORS_ONLN) --retry 3 + - name: Run tests run: bundle exec rake From 068e2e28112b5967d0e2c88e80b9e8dcd356a2da Mon Sep 17 00:00:00 2001 From: swiknaba Date: Wed, 13 Jan 2021 10:19:07 +0100 Subject: [PATCH 3/6] remove ruby-version file --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3e3b4c2..1d5d65a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ pkg/* .powder tmp bin -.ruby-version From e2ec88c3032f206f9f513a8bbe49d9e2e1058841 Mon Sep 17 00:00:00 2001 From: swiknaba Date: Wed, 13 Jan 2021 10:19:51 +0100 Subject: [PATCH 4/6] drop rbx specific gem --- Gemfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Gemfile b/Gemfile index d1172e4..0ef1cf1 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,3 @@ source 'https://rubygems.org' gemspec gem 'rack', RUBY_VERSION < '2.2.2' ? '~> 1.6' : '>= 2.0' - -platforms :rbx do - gem 'rubysl', '~> 2.0' -end From 8149ed4e77c54df69f658a27996dfd9ed707c1ea Mon Sep 17 00:00:00 2001 From: swiknaba Date: Wed, 13 Jan 2021 10:28:34 +0100 Subject: [PATCH 5/6] rollback using action/cache --- .github/workflows/ci.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0a76f9..0de7abf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,19 +21,8 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - - - uses: actions/cache@v2 - with: - path: vendor/bundle - key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - ${{ runner.os }}-gems- - - - name: bundle install - run: | - gem install bundler - bundle config path vendor/bundle - bundle install -j $(getconf _NPROCESSORS_ONLN) --retry 3 - + bundler-cache: true + - name: Install dependencies + run: bundle install - name: Run tests run: bundle exec rake From f9faf5e13cee25878f5b6824f211b3a307d9f56e Mon Sep 17 00:00:00 2001 From: swiknaba Date: Wed, 13 Jan 2021 10:32:27 +0100 Subject: [PATCH 6/6] update supported Rubies in Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index db001b7..be77d89 100644 --- a/README.md +++ b/README.md @@ -152,7 +152,7 @@ If you use the server-side flow, Facebook will give you back a longer lived acce ## Supported Rubies -- Ruby MRI (2.3, 2.4, 2.5, 2.6) +- Ruby MRI (2.5, 2.6, 2.7, 3.0) ## License