Skip to content

Commit

Permalink
Merge pull request #215 from buty4649/fix-ci-error
Browse files Browse the repository at this point in the history
Fix CI error on macos-14
  • Loading branch information
buty4649 authored Jul 16, 2024
2 parents d3cfcd3 + 8046fe1 commit a3ebcbd
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 20 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ jobs:
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3
- name: Install dependencies
run: bundle install
- name: Run rubocop
Expand All @@ -39,7 +37,6 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3
bundler-cache: true
- name: build
run: rake build:${{ matrix.os-arch }}
Expand Down Expand Up @@ -72,7 +69,6 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3
bundler-cache: true
- name: Install dependencies
run: bundle install
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3
bundler-cache: true
- name: Build assets
run: rake build:assets
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ require: rubocop-rspec

AllCops:
NewCops: enable
TargetRubyVersion: 3.3
SuggestExtensions: false
Exclude:
- build/**/*
- mruby/**/*

Lint/AssignmentInCondition:
Enabled: false
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.3.4
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
source 'https://rubygems.org/'

ruby file: '.ruby-version'

gem 'rake'

group 'test' do
gem 'aruba', github: 'cucumber/aruba', branch: 'main'
gem 'ffi'
gem 'parallel_tests'
gem 'rspec'
gem 'rspec-parameterized', '>= 1.0.0'
gem 'rubocop'
gem 'rubocop-rspec'

# fix: build error on windows
gem 'ffi', github: 'ffi/ffi', branch: 'master'
end
19 changes: 9 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@ GIT
rspec-expectations (~> 3.4)
thor (~> 1.0)

GIT
remote: https://github.com/ffi/ffi.git
revision: ecfb225096ae76ba2a5e8115f046bd0ac23095e6
branch: master
specs:
ffi (1.17.0)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -54,6 +47,9 @@ GEM
cucumber-tag-expressions (6.1.0)
debug_inspector (1.2.0)
diff-lcs (1.5.1)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x64-mingw-ucrt)
ffi (1.17.0-x86_64-linux-gnu)
json (2.7.2)
language_server-protocol (3.17.0.3)
mini_mime (1.1.5)
Expand Down Expand Up @@ -124,19 +120,22 @@ GEM
parser (>= 3.3.0)

PLATFORMS
arm64-darwin-22
arm64-darwin-23
x64-mingw-ucrt
x86_64-linux

DEPENDENCIES
aruba!
ffi!
ffi
parallel_tests
rake
rspec
rspec-parameterized (>= 1.0.0)
rubocop
rubocop-rspec

RUBY VERSION
ruby 3.3.4p94

BUNDLED WITH
2.5.3
2.5.11
Binary file removed perf.data
Binary file not shown.

0 comments on commit a3ebcbd

Please sign in to comment.