Skip to content

Commit

Permalink
Merge pull request #924 from tdiary/actions
Browse files Browse the repository at this point in the history
Migrate Travis CI to GitHub Actions
  • Loading branch information
hsbt committed Jan 23, 2021
2 parents 7ff2ce4 + 8994ff5 commit 18eeedc
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 40 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/ci.yml
@@ -0,0 +1,29 @@
name: ubuntu

on: [push, pull_request]

jobs:
build:
name: build (${{ matrix.ruby }}/${{ matrix.test_mode }})
strategy:
matrix:
ruby: [ '3.0', 2.7, 2.6, 2.5 ]
test_mode: [ rack, gem ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- uses: niden/actions-memcached@v7
- name: Install dependencies
run: |
echo 'gemspec' > Gemfile.local
gem update bundler --no-document
bundle install --without server --jobs=3 --retry=3
npm install
- name: Run test
run: if [ $TEST_MODE = "gem" ] ; then bundle exec tdiary test ; else bundle exec rake spec jasmine:ci test ; fi
env:
TEST_MODE: ${{ matrix.test_mode }}
39 changes: 0 additions & 39 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion misc/plugin/disp_referrer.rb
Expand Up @@ -655,7 +655,7 @@ def parse_as_search( setup )
k = key.to_s
if values[k] and not (encoded_uri = values[k][0]).empty? then
begin
original_uri = URI::parse( urlbase ) + URI::parse( URI::decode(encoded_uri) )
original_uri = URI::parse( urlbase ) + URI::parse( URI.decode_www_form_component(encoded_uri) )
throw :done if original_uri == urlbase # denial of service?
self.replace_with( DispRef2URL.new( original_uri.to_s ).parse( setup ) )
return self
Expand Down
2 changes: 2 additions & 0 deletions tdiary.gemspec
Expand Up @@ -42,5 +42,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'rack'
spec.add_dependency 'rake'
spec.add_dependency 'thor'
spec.add_dependency 'rexml'
spec.add_dependency 'webrick'
spec.add_dependency "bundler", ">= 1.3", "< 3.0"
end

0 comments on commit 18eeedc

Please sign in to comment.