From f78b1763505d435f349a0d6dc8be18dc09418aac Mon Sep 17 00:00:00 2001 From: Nate Smith Date: Mon, 16 May 2022 12:19:28 -0400 Subject: [PATCH 1/4] Work around bug in JDK for JRuby tests --- .github/workflows/ruby.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 54a1561..47a6651 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -30,8 +30,6 @@ jobs: - truffleruby-head - mingw exclude: - - { os: ubuntu, ruby: jruby } - - { os: ubuntu, ruby: jruby-head } - { os: ubuntu, ruby: mingw } - { os: macos, ruby: mingw } - { os: windows, ruby: truffleruby } @@ -46,8 +44,12 @@ jobs: with: ruby-version: ${{ matrix.ruby }} bundler-cache: true + env: + JAVA_OPTS: -Djdk.io.File.enableADS=true - name: Run tests run: bundle exec rake default + env: + JAVA_OPTS: -Djdk.io.File.enableADS=true finish: runs-on: ubuntu-latest From cc28f9efdc40316467e8d82095f9f8def7d0dfc2 Mon Sep 17 00:00:00 2001 From: Nate Smith Date: Mon, 16 May 2022 12:25:52 -0400 Subject: [PATCH 2/4] Update rake-compiler --- bcrypt.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bcrypt.gemspec b/bcrypt.gemspec index 5971af1..3a4487e 100644 --- a/bcrypt.gemspec +++ b/bcrypt.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |s| s.files = `git ls-files`.split("\n") s.require_path = 'lib' - s.add_development_dependency 'rake-compiler', '~> 0.9.2' + s.add_development_dependency 'rake-compiler', '~> 1.2.0' s.add_development_dependency 'rspec', '>= 3' s.rdoc_options += ['--title', 'bcrypt-ruby', '--line-numbers', '--inline-source', '--main', 'README.md'] From 6d051de5ac04f08cc1e681e045c582dc61555c2a Mon Sep 17 00:00:00 2001 From: Nate Smith Date: Mon, 16 May 2022 14:19:03 -0400 Subject: [PATCH 3/4] Fix compiler warnings --- ext/mri/bcrypt_ext.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/ext/mri/bcrypt_ext.c b/ext/mri/bcrypt_ext.c index 6c68504..2366185 100644 --- a/ext/mri/bcrypt_ext.c +++ b/ext/mri/bcrypt_ext.c @@ -71,8 +71,6 @@ static void * bc_crypt_nogvl(void * ptr) { */ static VALUE bc_crypt(VALUE self, VALUE key, VALUE setting) { char * value; - void * data; - int size; VALUE out; struct bc_crypt_args args; From 87f132256456eb7cb3d403ffba245e9906bd9531 Mon Sep 17 00:00:00 2001 From: Nate Smith Date: Mon, 16 May 2022 16:20:41 -0400 Subject: [PATCH 4/4] Remove AppVeyor configuration --- README.md | 1 - appveyor.yml | 50 -------------------------------------------------- 2 files changed, 51 deletions(-) delete mode 100644 appveyor.yml diff --git a/README.md b/README.md index 23a4775..dd55971 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ An easy way to keep your users' passwords secure. * https://github.com/bcrypt-ruby/bcrypt-ruby/tree/master [![Github Actions Build Status](https://github.com/bcrypt-ruby/bcrypt-ruby/actions/workflows/ruby.yml/badge.svg?branch=master)](https://github.com/bcrypt-ruby/bcrypt-ruby/actions/workflows/ruby.yml) -[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/6fplerx9lnaf0hyo?svg=true)](https://ci.appveyor.com/project/TJSchuck35975/bcrypt-ruby) ## Why you should use `bcrypt()` diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index e832e22..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,50 +0,0 @@ -version: "{branch}-{build}" -build: off -clone_depth: 1 - -init: - # Install Ruby head - - if %RUBY_VERSION%==head ( - appveyor DownloadFile https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x86.exe -FileName C:\head_x86.exe & - C:\head_x86.exe /verysilent /dir=C:\Ruby%RUBY_VERSION% - ) - - if %RUBY_VERSION%==head-x64 ( - appveyor DownloadFile https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.exe -FileName C:\head_x64.exe & - C:\head_x64.exe /verysilent /dir=C:\Ruby%RUBY_VERSION% - ) - - # Add Ruby to the path - - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH% - -environment: - matrix: - - RUBY_VERSION: "head" - - RUBY_VERSION: "head-x64" - - RUBY_VERSION: "25" - - RUBY_VERSION: "25-x64" - - RUBY_VERSION: "24" - - RUBY_VERSION: "24-x64" - - RUBY_VERSION: "23" - - RUBY_VERSION: "23-x64" - - RUBY_VERSION: "22" - - RUBY_VERSION: "22-x64" - - RUBY_VERSION: "21" - - RUBY_VERSION: "21-x64" - - RUBY_VERSION: "200" - - RUBY_VERSION: "200-x64" - -install: - - ps: "Set-Content -Value 'gem: --no-ri --no-rdoc ' -Path C:\\ProgramData\\gemrc" - - if %RUBY_VERSION%==head ( gem install bundler -v'< 2' ) - - if %RUBY_VERSION%==head-x64 ( gem install bundler -v'< 2' ) - - bundle install - -before_build: - - ruby -v - - gem -v - -build_script: - - bundle exec rake compile -rdevkit - -test_script: - - bundle exec rake spec