From b04891209aaa731c1499e620009f854b189ab66a Mon Sep 17 00:00:00 2001 From: Dov Murik Date: Tue, 12 Oct 2021 10:53:15 +0300 Subject: [PATCH 1/4] windows: Prevent compile failure on windows with mingw mingw on windows doesn't support the ui64 literal integer suffix, but might define _UI64_MAX. Replace order of nested ifdefs. --- ext/salsa20_ext/ecrypt-config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/salsa20_ext/ecrypt-config.h b/ext/salsa20_ext/ecrypt-config.h index d2f8f0d..1ac7dbc 100644 --- a/ext/salsa20_ext/ecrypt-config.h +++ b/ext/salsa20_ext/ecrypt-config.h @@ -283,8 +283,8 @@ #ifdef _UI64_MAX -#if (_UI64_MAX / 0xFFFFFFFFui64 > 0xFFFFFFFFui64) #ifndef I64T +#if (_UI64_MAX / 0xFFFFFFFFui64 > 0xFFFFFFFFui64) #define I64T __int64 #define U64C(v) (v##ui64) #endif From 5fd9585aec140c06404472a7bfabc7291de54020 Mon Sep 17 00:00:00 2001 From: Dov Murik Date: Tue, 12 Oct 2021 10:57:45 +0300 Subject: [PATCH 2/4] windows: also run tests in github action --- .github/workflows/windows.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8e6d3b4..8db4bf5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,10 +20,9 @@ jobs: with: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true # runs 'bundle install' and caches installed gems automatically + - name: Run tests + run: bundle exec rake - name: Build gem run: bundle exec gem build salsa20.gemspec - name: Install gem - run: bundle exec gem install --verbose ./salsa20-*.gem ; cat D:/a/salsa20-ruby/salsa20-ruby/vendor/bundle/ruby/3.0.0/extensions/x64-mingw32/3.0.0/salsa20-0.1.3/gem_make.out ; exit 1 - #; exit 0 - # - name: Print results - #run: cat D:/a/salsa20-ruby/salsa20-ruby/vendor/bundle/ruby/3.0.0/extensions/x64-mingw32/3.0.0/salsa20-0.1.3/gem_make.out + run: bundle exec gem install --verbose ./salsa20-*.gem From 1193c52168148a9e5654e48a8e2b8a4ae110a5d7 Mon Sep 17 00:00:00 2001 From: Dov Murik Date: Tue, 12 Oct 2021 11:09:00 +0300 Subject: [PATCH 3/4] windows: workflow job continue-on-error --- .github/workflows/windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8db4bf5..ba9c655 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -7,8 +7,9 @@ on: branches: [ master ] jobs: - test: + windows-test: runs-on: windows-latest + continue-on-error: true strategy: matrix: ruby-version: ['2.7', '3.0'] From 8bc067127912748a73722faca8ff2740d2711eb4 Mon Sep 17 00:00:00 2001 From: Dov Murik Date: Tue, 12 Oct 2021 11:37:33 +0300 Subject: [PATCH 4/4] windows: another attempt to print gem_make.out log file --- .github/workflows/windows.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ba9c655..1d0de55 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -27,3 +27,7 @@ jobs: run: bundle exec gem build salsa20.gemspec - name: Install gem run: bundle exec gem install --verbose ./salsa20-*.gem + continue-on-error: true + - name: Print gem make log + run: cat D:/a/salsa20-ruby/salsa20-ruby/vendor/bundle/ruby/3.0.0/extensions/x64-mingw32/3.0.0/salsa20-0.1.3/gem_make.out + continue-on-error: true