Skip to content

Commit

Permalink
Merge pull request #150 from flavorjones/flavorjones-ci-ruby-head
Browse files Browse the repository at this point in the history
ci: move ruby-head tests into upstream workflow
  • Loading branch information
flavorjones authored Jul 27, 2024
2 parents 3c36b20 + f0bd171 commit b2bee41
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
platform: [ubuntu-latest, windows-latest, macos-latest]
ruby: ["2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "head"]
ruby: ["2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
exclude:
# I can't figure out how to install these on macos through setup-ruby
- ruby: "2.3"
Expand Down
25 changes: 22 additions & 3 deletions .github/workflows/upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,26 @@ on:
- .github/workflows/upstream.yml # this file

jobs:
skeleton:
runs-on: ubuntu-latest
test-unit:
env:
MAKEFLAGS: -j2
strategy:
fail-fast: false
matrix:
platform: [ubuntu-latest, windows-latest, macos-latest]
ruby: ["head"]
runs-on: ${{ matrix.platform }}
steps:
- run: echo "Hello, World!"
- name: configure git crlf on windows
if: matrix.platform == 'windows-latest'
run: |
git config --system core.autocrlf false
git config --system core.eol lf
- uses: actions/checkout@v4
- uses: MSP-Greg/setup-ruby-pkgs@v1
with:
apt-get: _update_ build-essential cmake
mingw: _upgrade_ cmake
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- run: bundle exec rake test:unit
13 changes: 11 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
source 'https://rubygems.org'

gemspec

gem "net-ftp" if Gem::Requirement.new("> 3.1.0.dev").satisfied_by?(Gem::Version.new(RUBY_VERSION))

# Specify your gem's dependencies in mini_portile2.gemspec
gemspec
gem "minitar", "0.9"
gem "minitest", "~> 5.15" # open range for ruby 2.3 support
gem "minitest-hooks", "1.5.1"
gem "rake", "13.2.1"
if RUBY_VERSION >= "3.4"
gem "webrick", git: "https://github.com/ruby/webrick" # shouldn't be necessary to pin once webrick 1.8.2 or 1.9.0 is released
else
gem "webrick"
end
7 changes: 0 additions & 7 deletions mini_portile2.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,5 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = ">= 2.3.0"

spec.add_development_dependency "bundler", "~> 2.2"
spec.add_development_dependency "minitar", "~> 0.9"
spec.add_development_dependency "minitest", "~> 5.15"
spec.add_development_dependency "minitest-hooks", "~> 1.5"
spec.add_development_dependency "rake", "~> 13.0"
spec.add_development_dependency "webrick", "~> 1.7"

spec.metadata["changelog_uri"] = spec.homepage + "/blob/main/CHANGELOG.md"
end

0 comments on commit b2bee41

Please sign in to comment.