From abe89ff130cae30d42dd687847fedbecff7caac3 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 24 Feb 2021 03:06:28 -0800 Subject: [PATCH] Pronto-haml and no linting in travis --- .github/workflows/pronto.yml | 4 ++-- .travis.yml | 1 - Gemfile | 3 ++- Gemfile.lock | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pronto.yml b/.github/workflows/pronto.yml index f4fee6a0..c835da94 100644 --- a/.github/workflows/pronto.yml +++ b/.github/workflows/pronto.yml @@ -10,11 +10,11 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - run: | - git fetch --no-tags --prune --depth=10 origin +refs/heads/*:refs/remotes/origin/* + git fetch --no-tags --prune --depth=150 origin +refs/heads/*:refs/remotes/origin/* - name: Setup Ruby uses: ruby/setup-ruby@v1 - name: Setup pronto - run: gem install pronto pronto-rubocop + run: gem install pronto pronto-rubocop pronto-haml pronto-flay - name: Run Pronto run: pronto run -f github_status github_pr -c origin/${{ github.base_ref }} env: diff --git a/.travis.yml b/.travis.yml index cd6683e6..6d3ac828 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,6 @@ env: matrix: - TEST_SUITE=ability - TEST_SUITE=features - - TEST_SUITE=linters - TEST_SUITE=models - TEST_SUITE=controllers - TEST_SUITE=rest diff --git a/Gemfile b/Gemfile index 1cd982f1..c6da1286 100644 --- a/Gemfile +++ b/Gemfile @@ -278,6 +278,7 @@ group :development, :test do gem 'pry' gem 'pronto' - gem 'pronto-rubocop', require: false + gem 'pronto-haml', require: false gem 'pronto-flay', require: false + gem 'pronto-rubocop', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 574948c4..48194b80 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -401,6 +401,10 @@ GEM pronto-flay (0.11.0) flay (~> 2.8) pronto (~> 0.11.0) + pronto-haml (0.11.0) + haml_lint (~> 0.23) + pronto (~> 0.11.0) + rubocop (< 1.0) pronto-rubocop (0.11.1) pronto (~> 0.11.0) rubocop (>= 0.63.1, < 2.0) @@ -727,6 +731,7 @@ DEPENDENCIES prawn-rails pronto pronto-flay + pronto-haml pronto-rubocop pry puma (~> 3.0)