Skip to content

Commit

Permalink
Merge branch 'puma:master' into on_booted_feature
Browse files Browse the repository at this point in the history
  • Loading branch information
rodzyn committed Jul 30, 2022
2 parents 6112487 + e9f09ba commit 8e0f32c
Show file tree
Hide file tree
Showing 92 changed files with 3,792 additions and 1,588 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
75 changes: 0 additions & 75 deletions .github/workflows/mri.yml

This file was deleted.

79 changes: 0 additions & 79 deletions .github/workflows/non_mri.yml

This file was deleted.

79 changes: 79 additions & 0 deletions .github/workflows/ragel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: ragel

on:
push:
paths:
- 'ext/**'
- '.github/workflows/ragel.yml'
pull_request:
paths:
- 'ext/**'
- '.github/workflows/ragel.yml'
workflow_dispatch:

jobs:
ragel:
name: >-
ragel ${{ matrix.os }} ${{ matrix.ruby }}
env:
PUMA_NO_RUBOCOP: true

runs-on: ${{ matrix.os }}
if: |
!( contains(github.event.pull_request.title, '[ci skip]')
|| contains(github.event.pull_request.title, '[skip ci]'))
strategy:
fail-fast: false
matrix:
include:
- { os: ubuntu-20.04 , ruby: head }
- { os: macos-11 , ruby: head }
- { os: windows-2022 , ruby: ucrt }

steps:
# windows git will convert \n to \r\n
- name: git config
if: startsWith(matrix.os, 'windows')
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: repo checkout
uses: actions/checkout@v3

- name: load ruby
uses: ruby/setup-ruby-pkgs@v1
with:
ruby-version: ${{ matrix.ruby }}
apt-get: ragel
brew: ragel
bundler-cache: true
timeout-minutes: 10

- name: check ragel generation
shell: pwsh
run: |
ragel --version
Remove-Item -Path ext/puma_http11/http11_parser.c
Remove-Item -Path ext/puma_http11/org/jruby/puma/Http11Parser.java
rake ragel
if ($IsWindows) {
dos2unix ext/puma_http11/http11_parser.c
dos2unix ext/puma_http11/org/jruby/puma/Http11Parser.java
}
$git_out = $(git status --porcelain)
if ($git_out -ne $null) {
echo "** $git_out **`n"
git --no-pager diff
echo "`nbundle exec ragel changes a file"
exit 1
}
- name: save ragel generated files on fail
uses: actions/upload-artifact@v3
if: ${{ failure() }}
with:
name: ${{ matrix.os }}-ragel-generated-files
path: |
ext/puma_http11/http11_parser.c
ext/puma_http11/org/jruby/puma/Http11Parser.java

0 comments on commit 8e0f32c

Please sign in to comment.