Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

test-javascript:
name: Test JavaScript
uses: alphagov/govuk-infrastructure/.github/workflows/jasmine.yml@main
uses: alphagov/govuk-infrastructure/.github/workflows/jasmine.yml@corepack
with:
useWithRails: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cucumber.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
bundler-cache: true

- name: Setup Node
uses: alphagov/govuk-infrastructure/.github/actions/setup-node@main
uses: alphagov/govuk-infrastructure/.github/actions/setup-node@corepack

- name: Cache Playwright Chromium browser
id: playwright-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lintjs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
uses: actions/checkout@v5

- name: Setup Node
uses: alphagov/govuk-infrastructure/.github/actions/setup-node@main
uses: alphagov/govuk-infrastructure/.github/actions/setup-node@corepack

- name: Run lint:js
run: yarn run lint:js
2 changes: 1 addition & 1 deletion .github/workflows/lintprettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
uses: actions/checkout@v5

- name: Setup Node
uses: alphagov/govuk-infrastructure/.github/actions/setup-node@main
uses: alphagov/govuk-infrastructure/.github/actions/setup-node@corepack

- name: Run lint:prettier
run: yarn run lint:prettier
2 changes: 1 addition & 1 deletion .github/workflows/lintscss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
uses: actions/checkout@v5

- name: Setup Node
uses: alphagov/govuk-infrastructure/.github/actions/setup-node@main
uses: alphagov/govuk-infrastructure/.github/actions/setup-node@corepack

- name: Run lint:scss
run: yarn run lint:scss
2 changes: 1 addition & 1 deletion .github/workflows/minitest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
bundler-cache: true

- name: Setup Node
uses: alphagov/govuk-infrastructure/.github/actions/setup-node@main
uses: alphagov/govuk-infrastructure/.github/actions/setup-node@corepack

- name: Precompile assets
uses: alphagov/govuk-infrastructure/.github/actions/precompile-rails-assets@main
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
/failures
/node_modules
/yarn-error.log
.yarn/
.pnp.*
.cache/
.DS_Store
/app/assets/builds/*
Expand Down
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ ENV JWT_AUTH_SECRET=unused_yet_required
WORKDIR $APP_HOME
COPY Gemfile* .ruby-version ./
RUN bundle install
COPY package.json yarn.lock ./
RUN yarn install --production --frozen-lockfile --non-interactive --link-duplicates
COPY package.json yarn.lock ./
RUN corepack enable
RUN yarn install --immutable
COPY . .
RUN bootsnap precompile --gemfile .
RUN rails assets:precompile && rm -fr log
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"private": true,
"author": "Government Digital Service",
"license": "MIT",
"packageManager": "[email protected]",
"scripts": {
"lint": "yarn run lint:js && yarn run lint:scss && yarn run lint:prettier",
"lint:js": "eslint --cache --cache-location .cache/eslint --color --ignore-path .gitignore -- \"**/*.js\"",
Expand Down
Loading
Loading