From d9bf1bbc112f4ca62098f917c73f0e15e6d65e65 Mon Sep 17 00:00:00 2001 From: Marc Anguera Insa Date: Wed, 17 Jan 2024 18:49:36 +0100 Subject: [PATCH 1/4] fix tests --- Gemfile | 18 +++++++++--------- middleman-syntax.gemspec | 5 ++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 61a6773..ad1e4e3 100644 --- a/Gemfile +++ b/Gemfile @@ -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 @@ -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' diff --git a/middleman-syntax.gemspec b/middleman-syntax.gemspec index 8dfb496..860c172 100644 --- a/middleman-syntax.gemspec +++ b/middleman-syntax.gemspec @@ -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") From 20e41c0f454467b7d65370641ddb4c5657f20c28 Mon Sep 17 00:00:00 2001 From: Marc Anguera Insa Date: Wed, 17 Jan 2024 18:50:25 +0100 Subject: [PATCH 2/4] migrate to GH Actions --- .github/workflows/ci.yml | 25 +++++++++++++++++++++++++ .travis.yml | 14 -------------- 2 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..b544a54 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,25 @@ +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: Delete Gemfile.lock + run: rm Gemfile.lock + - 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 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a4d08c5..0000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -rvm: - - ruby-head - - 2.6.3 - - 2.5.5 -os: - - linux -matrix: - fast_finish: true - allow_failures: - - rvm: ruby-head -script: "bundle exec rake test" - -env: TEST=true -sudo: false From b36f10cac593a3b590b919b916087c13a913dacf Mon Sep 17 00:00:00 2001 From: Marc Anguera Insa Date: Wed, 17 Jan 2024 18:52:55 +0100 Subject: [PATCH 3/4] [docs] fix CI badges --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 5fa9c9e..79ab63c 100644 --- a/README.md +++ b/README.md @@ -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 From 5d5fe80d444bc5ef4f26853669b95c9c705e12ae Mon Sep 17 00:00:00 2001 From: Marc Anguera Insa Date: Wed, 17 Jan 2024 19:38:13 +0100 Subject: [PATCH 4/4] [ci] delete unnecessary step --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b544a54..c02cbf1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,8 +12,6 @@ jobs: ruby-version: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5"] steps: - uses: actions/checkout@v4 - - name: Delete Gemfile.lock - run: rm Gemfile.lock - name: Set up Ruby uses: ruby/setup-ruby@v1 with: