Skip to content

Commit

Permalink
Remove tailor and cane
Browse files Browse the repository at this point in the history
These don't work on Ruby 3.0

Signed-off-by: Dan Webb <[email protected]>
  • Loading branch information
damacus committed Nov 13, 2023
1 parent 8a18bc5 commit 1cbdab3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 28 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Lint & Unit

'on':
"on":
pull_request:
push:
branches:
Expand All @@ -12,15 +12,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@master
uses: actions/checkout@v4
- name: Lint YAML
uses: koozz/yamllint-action@main

chefstyle:
runs-on: ubuntu-latest
strategy:
matrix:
ruby: ['2.7']
ruby: ["2.7"]
name: Chefstyle on Ruby ${{ matrix.ruby }}
steps:
- uses: actions/checkout@v2
Expand All @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby: ['2.7', '3.0', '3.1']
ruby: ["2.7", "3.0", "3.1"]
steps:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
Expand All @@ -52,14 +52,15 @@ jobs:
needs: unit
strategy:
matrix:
ruby: ['2.7', '3.0', '3.1']
ruby: ["2.7", "3.0", "3.1"]
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- run: bundle exec rake spec

integration-windows:
name: Integration test on Windows
Expand All @@ -86,6 +87,6 @@ jobs:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.1'
ruby-version: "3.1"
bundler-cache: true
- run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
4 changes: 0 additions & 4 deletions .tailor

This file was deleted.

14 changes: 6 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ gemspec
group :integration do
gem "bundler"
gem "rake"
gem "cane"
gem "tailor"
gem "countloc"
gem "rspec", "~> 3.2"
gem "rspec-its", "~> 1.2"
gem "fuubar", "~> 2.0"
gem "simplecov", "~> 0.9"
gem "codecov", "~> 0.0", ">= 0.0.2"
gem "kitchen-inspec", "~> 2.0"
gem "rspec", "~> 3.4"
gem "rspec-its", "~> 1.3"
gem "fuubar", "~> 2.5"
gem "simplecov", "~> 0.22"
gem "codecov", "~> 0.0", ">= 0.2.0"
gem "kitchen-inspec", "~> 2.6"
gem "train", ">= 2.1", "< 4.0" # validate 4.x when it's released
gem "chefstyle"
end
11 changes: 1 addition & 10 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
require "bundler/gem_tasks"
require "cane/rake_task"
require "tailor/rake_task"

desc "Run cane to check quality metrics"
Cane::RakeTask.new do |cane|
cane.canefile = "./.cane"
end

Tailor::RakeTask.new

desc "Display LOC stats"
task :stats do
Expand All @@ -16,7 +7,7 @@ task :stats do
end

desc "Run all quality tasks"
task quality: %i{cane tailor stats}
task quality: %i{stats}

task default: [:quality]

Expand Down

0 comments on commit 1cbdab3

Please sign in to comment.