diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a4399a933..ae4697430 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,16 +30,16 @@ jobs: uses: actions/setup-node@v3 with: node-version: 20.9.0 - cache: 'npm' + cache: "npm" - name: Install dependencies run: | sudo apt-get update && sudo apt-get -yqq install libpq-dev bundle install --jobs 4 --retry 3 bundle exec rails assets:precompile env: - DATABASE_URL: postgres://postgres:password@localhost:5432 - GOVUK_NOTIFY_API_KEY: fake_key - SIGN_IN_METHOD: persona + DATABASE_URL: postgres://postgres:password@localhost:5432 + GOVUK_NOTIFY_API_KEY: fake_key + SIGN_IN_METHOD: persona - name: ${{ matrix.tests }} run: ${{ env.COMMAND }} env: @@ -52,16 +52,16 @@ jobs: name: Test runs-on: ubuntu-latest services: - postgres: - image: postgres:16 - env: - POSTGRES_PASSWORD: password - ports: ['5432:5432'] - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 + postgres: + image: postgres:16 + env: + POSTGRES_PASSWORD: password + ports: ["5432:5432"] + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 strategy: fail-fast: false steps: @@ -77,16 +77,16 @@ jobs: uses: actions/setup-node@v3 with: node-version: 20.9.0 - cache: 'npm' + cache: "npm" - name: Install dependencies run: | sudo apt-get update && sudo apt-get -yqq install libpq-dev bundle install --jobs 4 --retry 3 bundle exec rails assets:precompile env: - DATABASE_URL: postgres://postgres:password@localhost:5432 - GOVUK_NOTIFY_API_KEY: fake_key - SIGN_IN_METHOD: persona + DATABASE_URL: postgres://postgres:password@localhost:5432 + GOVUK_NOTIFY_API_KEY: fake_key + SIGN_IN_METHOD: persona - name: Run Tests env: RAILS_ENV: test @@ -98,4 +98,4 @@ jobs: run: | bundle exec rake db:create bundle exec rails db:schema:load - bundle exec rspec --format progress \ No newline at end of file + bundle exec rspec --format progress diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss index 48e6917e6..bf7427800 100644 --- a/app/assets/stylesheets/application.sass.scss +++ b/app/assets/stylesheets/application.sass.scss @@ -2,4 +2,4 @@ $govuk-global-styles: true; $govuk-new-link-styles: true; $govuk-assets-path: ""; -@import "govuk-frontend/dist/govuk/all"; \ No newline at end of file +@import "govuk-frontend/dist/govuk/all"; diff --git a/config/application.rb b/config/application.rb index 4fb41affd..43e34318d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -31,7 +31,9 @@ class Application < Rails::Application # config.time_zone = "Central Time (US & Canada)" # config.eager_load_paths << Rails.root.join("extras") - config.assets.paths << Rails.root.join("node_modules/govuk-frontend/dist/govuk/assets") + config.assets.paths << Rails.root.join( + "node_modules/govuk-frontend/dist/govuk/assets" + ) config.exceptions_app = routes end