From 902f9d2fa67845de006093b6cd494c12f6738b05 Mon Sep 17 00:00:00 2001 From: Cristen Jones Date: Thu, 12 Dec 2024 13:37:11 -0500 Subject: [PATCH] streamlined install commands --- .github/actions/setup-all/action.yml | 3 +-- .github/workflows/tests.yml | 2 +- deploy/dotcom/prod/Dockerfile | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/actions/setup-all/action.yml b/.github/actions/setup-all/action.yml index d477225ee1..6d371b0540 100644 --- a/.github/actions/setup-all/action.yml +++ b/.github/actions/setup-all/action.yml @@ -58,5 +58,4 @@ runs: shell: bash run: | git config --global url."https://github.com/".insteadOf ssh://git@github.com/ - npm install --prefix assets --package-lock-only - npm run install:ci + npm run assets:install:ci diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0c75301aab..083a01fea5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -101,7 +101,7 @@ jobs: priv react_renderer/dist/app.js key: ci-application-cache-${{ github.sha }} - - run: npm install --prefix assets -S -install-links deps/mbta_metro/priv/ + - run: npm run assets:install:ci - run: npm --prefix assets run webpack:build - run: npm --prefix assets run webpack:build:react - run: mix compile --all-warnings diff --git a/deploy/dotcom/prod/Dockerfile b/deploy/dotcom/prod/Dockerfile index 0a0c5ed906..30e3281d8c 100644 --- a/deploy/dotcom/prod/Dockerfile +++ b/deploy/dotcom/prod/Dockerfile @@ -39,9 +39,7 @@ ADD ./assets /root/assets WORKDIR /root/assets -RUN npm install --package-lock-only -RUN npm ci --ignore-scripts -RUN npm install -S -install-links ../deps/mbta_metro/priv/ +RUN npm run install:ci # required so that Tailwind styles used in Elixir templates are built COPY ./lib/dotcom_web/ /root/lib/dotcom_web