diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 860cf224..7e52e79d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,6 +9,7 @@ on: env: RUBY_VERSION: 3.0.6 + NODE_VERSION: 16.9.1 jobs: lint-report: @@ -25,3 +26,6 @@ jobs: - run: bundle exec rubocop -P name: Lint Ruby files + + - run: bundle exec erblint app/**/*.erb + name: Lint ERB files diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a4996077..545d8380 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,11 +54,7 @@ jobs: node-version: ${{ env.NODE_VERSION }} - name: Precompile assets - run: | - npm ci - bundle exec rake assets:precompile - env: - RAILS_ENV: test + run: RAILS_ENV=test bundle exec rails assets:precompile - name: Run RSpec run: SIMPLECOV=1 CODECOV=1 bundle exec rspec diff --git a/Gemfile.lock b/Gemfile.lock index ddeae649..d54ffc9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -884,8 +884,8 @@ GEM zeitwerk (2.6.12) PLATFORMS - x86_64-linux x86_64-darwin-23 + x86_64-linux DEPENDENCIES aws-sdk-s3 diff --git a/app/overrides/decidim/conferences/conferences/show/show_donate.html.erb.deface b/app/overrides/decidim/conferences/conferences/show/show_donate.html.erb.deface index 7d1022ff..8474ab9c 100644 --- a/app/overrides/decidim/conferences/conferences/show/show_donate.html.erb.deface +++ b/app/overrides/decidim/conferences/conferences/show/show_donate.html.erb.deface @@ -4,7 +4,7 @@