Skip to content

Commit

Permalink
Merge pull request #83 from markets/fix_tests
Browse files Browse the repository at this point in the history
Fix CI and migrate to GH Actions
  • Loading branch information
tdreyno authored Jan 17, 2024
2 parents d1b3edd + 5d5fe80 commit 6b7a777
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 28 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: CI

on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-latest
name: ubuntu-ruby-${{ matrix.ruby-version }}
strategy:
fail-fast: false
matrix:
ruby-version: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5"]
steps:
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true
- name: Runs tests
run: bundle exec rake test
env:
TEST: true
14 changes: 0 additions & 14 deletions .travis.yml

This file was deleted.

18 changes: 9 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "https://rubygems.org"

gem "middleman-core", :git => "https://github.com/middleman/middleman.git", :branch => '4.x'
gem "middleman-core", git: "https://github.com/middleman/middleman.git"

# Specify your gem's dependencies in middleman-syntax.gemspec
gemspec
Expand All @@ -11,17 +11,17 @@ gem 'yard', '~> 0.8', require: false

# Test tools
gem 'pry', '~> 0.10', group: :development
gem 'aruba', '~> 0.10.0'
gem 'aruba', '~> 1.0.0'
gem 'rspec', '~> 3.0'
gem 'cucumber', '~> 2.0'
gem 'capybara', '~> 2.5.0'

platforms :ruby do
gem "redcarpet"
end
gem 'haml', '< 6'
gem 'slim', '< 5'
gem 'kramdown'
gem "redcarpet"

# Code Quality
gem "cane", :platforms => [:mri_19, :mri_20], :require => false
gem "cane", require: false

# For old rubies
gem 'nokogiri', ['~> 1.5', '< 1.7']
# For old Rubies
gem 'nokogiri', '~> 1.12.0'
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
`middleman-syntax` is an extension for the [Middleman] static site generator that adds syntax highlighting via [Rouge](https://github.com/jayferd/rouge).

[![Gem Version](https://badge.fury.io/rb/middleman-syntax.svg)][gem]
[![Build Status](https://travis-ci.org/middleman/middleman-syntax.svg)][travis]
[![Dependency Status](https://gemnasium.com/middleman/middleman-syntax.svg?travis)][gemnasium]
[![CI](https://github.com/middleman/middleman-syntax/actions/workflows/ci.yml/badge.svg)](https://github.com/middleman/middleman-syntax/actions/workflows/ci.yml)
[![Code Quality](https://codeclimate.com/github/middleman/middleman-syntax.svg)][codeclimate]

## Installation
Expand Down
5 changes: 2 additions & 3 deletions middleman-syntax.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
s.add_runtime_dependency("middleman-core", [">= 3.2"])
s.add_runtime_dependency("rouge", ["~> 3.2"])
s.add_development_dependency("aruba", "~> 0.5.1")
s.add_development_dependency("cucumber", "~> 1.3.1")
s.add_development_dependency("fivemat")
s.add_development_dependency("aruba")
s.add_development_dependency("cucumber")
s.add_development_dependency("haml")
s.add_development_dependency("kramdown")
s.add_development_dependency("slim")
Expand Down

0 comments on commit 6b7a777

Please sign in to comment.