Skip to content

Commit 8b51715

Browse files
committed
Switch to gitlab ci and remove 2.{3,4} support
1 parent fef7db9 commit 8b51715

File tree

8 files changed

+58
-15
lines changed

8 files changed

+58
-15
lines changed

.gitlab-ci.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
stages:
3+
- test
4+
- coverage
5+
6+
default:
7+
before_script:
8+
- apt-get update -qy
9+
- apt-get install -y libtidy-dev
10+
- ruby -v
11+
- which ruby
12+
- gem install bundler --no-document
13+
- bundle install --jobs $(nproc) "${FLAGS[@]}"
14+
15+
.tests:
16+
script:
17+
- bundle exec rake
18+
stage: test
19+
20+
test:2.5:
21+
extends: .tests
22+
image: 'ruby:2.5'
23+
script:
24+
- bundle exec rake
25+
26+
test:2.6:
27+
extends: .tests
28+
image: 'ruby:2.6'
29+
script:
30+
- bundle exec rake
31+
32+
test:2.7:
33+
extends: .tests
34+
image: 'ruby:2.7'
35+
36+
test:jruby:
37+
extends: .tests
38+
image: 'jruby:9.2.12-jre'
39+
40+
coverage:
41+
image: 'ruby:2.7'
42+
script:
43+
- bundle exec rake test
44+
artifacts:
45+
paths:
46+
- coverage/
47+
stage: coverage

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
AllCops:
3-
TargetRubyVersion: 2.3
3+
TargetRubyVersion: 2.5
44
Naming/FileName:
55
Enabled: false
66
Lint/MissingCopEnableDirective:

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
---
2-
dist: xenial
2+
dist: bionic
33
sudo: true
44
language: ruby
55
cache: bundler
66
before_install:
77
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-64bit.deb; sudo apt-get remove '^libtidy.*'; sudo dpkg -i tidy-5.4.0-64bit.deb; fi
8-
- gem install bundler -v '<2'
8+
- gem install bundler --no-document
99
rvm:
10-
- 2.3
11-
- 2.4
1210
- 2.5
1311
- 2.6
1412
- 2.7

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ source 'https://rubygems.org'
44

55
gemspec
66

7-
gem 'coveralls', require: false
7+
gem 'simplecov', require: false
88

99
# vim: syntax=ruby filetype=ruby

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ The MIT License
148148
Copyright (c) 2009-2020 Laurent Arnoud <[email protected]>
149149

150150
---
151-
[![Build](https://img.shields.io/travis/spk/validate-website.svg)](https://travis-ci.org/spk/validate-website)
151+
[![Build](https://img.shields.io/gitlab/pipeline/spkdev/validate-website/master)](https://gitlab.com/spkdev/validate-website/-/commits/master)
152+
[![Coverage](https://gitlab.com/spkdev/validate-website/badges/master/coverage.svg)](https://gitlab.com/spkdev/validate-website/-/commits/master)
152153
[![Version](https://img.shields.io/gem/v/validate-website.svg)](https://rubygems.org/gems/validate-website)
153154
[![Documentation](https://img.shields.io/badge/doc-rubydoc-blue.svg)](http://www.rubydoc.info/gems/validate-website)
154155
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT "MIT")
155-
[![Coverage Status](https://img.shields.io/coveralls/github/spk/validate-website.svg)](https://coveralls.io/github/spk/validate-website?branch=master)
156156
[![Inline docs](https://inch-ci.org/github/spk/validate-website.svg?branch=master)](http://inch-ci.org/github/spk/validate-website)

Rakefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ require 'rake/testtask'
44
require 'rubocop/rake_task'
55
require 'asciidoctor'
66

7-
default = %i[test]
8-
default << :rubocop unless RUBY_ENGINE == 'rbx'
7+
default = %i[test rubocop]
98
task default: default
109

1110
desc 'Update manpage from asciidoc file'

test/test_helper.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# frozen_string_literal: true
22

33
begin
4-
require 'coveralls'
5-
Coveralls.wear!
4+
require 'simplecov'
5+
SimpleCov.start
66
rescue LoadError
7-
warn 'coveralls not loaded'
7+
warn 'simplecov not loaded'
88
end
99

1010
require 'minitest/autorun'

validate-website.gemspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
1111
s.name = 'validate-website'
1212
s.version = ValidateWebsite::VERSION
1313
s.license = 'MIT'
14-
s.required_ruby_version = '>= 2.3.0'
14+
s.required_ruby_version = '>= 2.5'
1515
s.add_dependency 'crass', '~> 1'
1616
s.add_dependency 'paint', '~> 2'
1717
s.add_dependency 'slop', '~> 4.6'
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
2020
s.add_dependency 'w3c_validators', '~> 1.3'
2121
s.add_development_dependency 'asciidoctor', '~> 1.5'
2222
s.add_development_dependency 'minitest', '~> 5.0'
23-
s.add_development_dependency('racc') if RUBY_ENGINE == 'rbx'
2423
s.add_development_dependency 'rake', '~> 12'
2524
s.add_development_dependency 'rubocop', '~> 0.76.0'
2625
s.add_development_dependency 'webmock', '~> 3.4'

0 commit comments

Comments
 (0)