Skip to content
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.

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

Try Github Actions #1918

Merged
merged 1 commit into from
Sep 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
69 changes: 69 additions & 0 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: Puma

on:
push:
branches:
- master
pull_request:
branches:
- '*'

jobs:
build:
name: >-
OS: ${{ matrix.os }} Ruby: ${{ matrix.ruby }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ 'ubuntu-16.04', 'ubuntu-18.04', 'macos', 'windows-latest' ]
ruby: [ '2.3.x', '2.4.x', '2.5.x', '2.6.x' ]
exclude:
- os: ubuntu-16.04
ruby: 2.4.x
- os: ubuntu-16.04
ruby: 2.5.x
- os: ubuntu-16.04
ruby: 2.6.x
- os: ubuntu-18.04
ruby: 2.3.x
- os: macos
ruby: 2.3.x
- os: windows-latest
ruby: 2.3.x
steps:
- name: repo checkout
uses: actions/checkout@v1
with:
fetch-depth: 10
- name: load ruby
uses: actions/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}

- name: ubuntu & macos - install ragel
if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
run: |
if [ "${{ matrix.os }}" == "macos" ]; then
brew install ragel
else
sudo apt-get install ragel
fi
- name: windows - update MSYS2, openssl, ragel
if: startsWith(matrix.os, 'windows')
uses: MSP-Greg/msys2-action@master
with:
base: update
mingw: openssl ragel

- name: RubyGems, Bundler Update
run: gem update --system --no-document --conservative
- name: bundle install
run: bundle install --jobs 4 --retry 3
- name: compile
run: bundle exec rake compile
- name: test
run: bundle exec rake
env:
CI: true
TESTOPTS: -v
12 changes: 0 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ script:

rvm:
- 2.2.10
- 2.3.8
- 2.4.7
- 2.5.6
- 2.6.4
- ruby-head

matrix:
Expand All @@ -45,14 +41,6 @@ matrix:
env: OS="Bionic 18.04 OpenSSL 1.1.1"
- rvm: ruby-head
env: jit=yes
- rvm: 2.4.6
os: osx
osx_image: xcode11
env: OS="osx xcode11"
- rvm: 2.5.6
os: osx
osx_image: xcode11
env: OS="osx xcode11"
- rvm: jruby-9.2.8.0
env: JRUBY_OPTS="--debug" JAVA_OPTS="--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist --add-opens java.base/java.util.zip=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.security.cert=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED"
- rvm: jruby-head
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/puma/puma?utm\_source=badge&utm\_medium=badge&utm\_campaign=pr-badge)
[![Travis Build Status](https://travis-ci.org/puma/puma.svg?branch=master)](https://travis-ci.org/puma/puma)
[![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/0xnxc7a26u9b2bub/branch/master?svg=true)](https://ci.appveyor.com/project/puma/puma/branch/master)

[![Code Climate](https://codeclimate.com/github/puma/puma.svg)](https://codeclimate.com/github/puma/puma)
[![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=puma&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=puma&package-manager=bundler&version-scheme=semver)

Expand Down
20 changes: 0 additions & 20 deletions appveyor.yml

This file was deleted.

9 changes: 4 additions & 5 deletions test/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,10 @@ def skip_on(*engs, suffix: '', bt: caller)
skip_msg = false
engs.each do |eng|
skip_msg = case eng
when :darwin then "Skipped on darwin#{suffix}" if RUBY_PLATFORM[/darwin/]
when :jruby then "Skipped on JRuby#{suffix}" if Puma.jruby?
when :windows then "Skipped on Windows#{suffix}" if Puma.windows?
when :appveyor then "Skipped on Appveyor#{suffix}" if ENV["APPVEYOR"]
when :ci then "Skipped on ENV['CI']#{suffix}" if ENV["CI"]
when :darwin then "Skipped on darwin#{suffix}" if RUBY_PLATFORM[/darwin/]
when :jruby then "Skipped on JRuby#{suffix}" if Puma.jruby?
when :windows then "Skipped on Windows#{suffix}" if Puma.windows?
when :ci then "Skipped on ENV['CI']#{suffix}" if ENV["CI"]
when :no_bundler then "Skipped w/o Bundler#{suffix}" if !defined?(Bundler)
else false
end
Expand Down