Skip to content

windows: Prevent compile failure on windows with mingw #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dubek wants to merge 4 commits into
base: master
Choose a base branch
from
Open

windows: Prevent compile failure on windows with mingw #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b048912
windows: Prevent compile failure on windows with mingw
dubek Oct 12, 2021
5fd9585
windows: also run tests in github action
dubek Oct 12, 2021
1193c52
windows: workflow job continue-on-error
dubek Oct 12, 2021
8bc0671
windows: another attempt to print gem_make.out log file
dubek Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand All @@ -20,10 +21,13 @@ 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
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
2 changes: 1 addition & 1 deletion ext/salsa20_ext/ecrypt-config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down