From cb88a49079d2921cba819dae117639ba1ddaaac7 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 10:37:31 -0600 Subject: [PATCH 01/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index f7f4a0d65..a50abc421 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -38,6 +38,9 @@ jobs: runs-on: ubuntu-latest needs: [variables] steps: + - uses: actions/setup-node@v4 + with: + node-version: '23.0.0-nightly202404297c3dce0e4f' - uses: actions/checkout@v3 - name: Compile USWDS assets working-directory: ./src From eeb5206c157e7d152c48be040437e6fa81daca9f Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 10:43:08 -0600 Subject: [PATCH 02/30] Change uses order --- .github/workflows/deploy-sandbox.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index a50abc421..a6b315d6b 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -38,10 +38,10 @@ jobs: runs-on: ubuntu-latest needs: [variables] steps: + - uses: actions/checkout@v3 - uses: actions/setup-node@v4 with: node-version: '23.0.0-nightly202404297c3dce0e4f' - - uses: actions/checkout@v3 - name: Compile USWDS assets working-directory: ./src run: | From 00c8d1cd42a46f69e080eb8094c50be8decd53bb Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:29:05 -0600 Subject: [PATCH 03/30] Update package.json --- src/package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/package.json b/src/package.json index 274e0e282..780ef587f 100644 --- a/src/package.json +++ b/src/package.json @@ -3,6 +3,10 @@ "version": "1.0.0", "description": "========================", "main": "index.js", + "engines": { + "node": "21.7.3" + }, + "engineStrict": true, "scripts": { "pa11y-ci": "pa11y-ci", "test": "echo \"Error: no test specified\" && exit 1" From 13ab27aee27ad7baaf14214cfc9af8f8e1163016 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:02:06 -0600 Subject: [PATCH 04/30] Update version --- .github/workflows/deploy-sandbox.yaml | 3 --- src/node.Dockerfile | 6 ++++-- src/package-lock.json | 4 ++++ src/package.json | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index a6b315d6b..f7f4a0d65 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -39,9 +39,6 @@ jobs: needs: [variables] steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v4 - with: - node-version: '23.0.0-nightly202404297c3dce0e4f' - name: Compile USWDS assets working-directory: ./src run: | diff --git a/src/node.Dockerfile b/src/node.Dockerfile index b478a8a26..cf0b6acc6 100644 --- a/src/node.Dockerfile +++ b/src/node.Dockerfile @@ -1,5 +1,5 @@ FROM docker.io/cimg/node:current-browsers - +FROM node:21.7.3 WORKDIR /app # Install app dependencies @@ -7,4 +7,6 @@ WORKDIR /app # where available (npm@5+) COPY --chown=circleci:circleci package*.json ./ -RUN npm install + +RUN npm install -g npm@10.5.0 +RUN npm install \ No newline at end of file diff --git a/src/package-lock.json b/src/package-lock.json index dc1464ee8..9df99a739 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -15,6 +15,10 @@ }, "devDependencies": { "@uswds/compile": "^1.0.0-beta.3" + }, + "engines": { + "node": "21.7.3", + "npm": "10.5.0" } }, "node_modules/@gulp-sourcemaps/identity-map": { diff --git a/src/package.json b/src/package.json index 780ef587f..1ceb8cb93 100644 --- a/src/package.json +++ b/src/package.json @@ -4,7 +4,8 @@ "description": "========================", "main": "index.js", "engines": { - "node": "21.7.3" + "node": "21.7.3", + "npm": "10.5.0" }, "engineStrict": true, "scripts": { From 09b8ec67ef38d59f517687fd617c2afdef219613 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:08:16 -0600 Subject: [PATCH 05/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index f7f4a0d65..3e0f1e881 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -39,6 +39,9 @@ jobs: needs: [variables] steps: - uses: actions/checkout@v3 + - uses: actions/setup-node@v4 + with: + node-version: '21.7.3' - name: Compile USWDS assets working-directory: ./src run: | From 5e03834954e51e43095418c43bf128b530fbebeb Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:12:57 -0600 Subject: [PATCH 06/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 3e0f1e881..78d924155 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -39,9 +39,13 @@ jobs: needs: [variables] steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v4 + - name: Set up Node js + uses: actions/setup-node@v4 with: node-version: '21.7.3' + run: | + npm install -g npm@10.5.0 + npm install -g node@21.7.3 - name: Compile USWDS assets working-directory: ./src run: | From ec69d7f6967f6eca39444d8d73aee35ed451f7e1 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:14:35 -0600 Subject: [PATCH 07/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 78d924155..0eba23b83 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -39,16 +39,13 @@ jobs: needs: [variables] steps: - uses: actions/checkout@v3 - - name: Set up Node js - uses: actions/setup-node@v4 - with: - node-version: '21.7.3' - run: | - npm install -g npm@10.5.0 - npm install -g node@21.7.3 - name: Compile USWDS assets + uses: actions/setup-node@v4 + with: + node-version: '21.7.3' working-directory: ./src run: | + docker compose run node npm install -g npm@10.5.0 docker compose run node npm install && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile From e1e04d977859bb395629ce30e97bea4a7d4001d4 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:16:35 -0600 Subject: [PATCH 08/30] Specify node version --- .github/workflows/deploy-sandbox.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 0eba23b83..036cbe503 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -40,12 +40,10 @@ jobs: steps: - uses: actions/checkout@v3 - name: Compile USWDS assets - uses: actions/setup-node@v4 - with: - node-version: '21.7.3' working-directory: ./src run: | - docker compose run node npm install -g npm@10.5.0 + docker compose run node npm install -g node@21.7.3 && + docker compose run node npm install -g npm@10.5.0 && docker compose run node npm install && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile From 2f4ac994c7e02eae1201b71159ae97c791efb422 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:21:39 -0600 Subject: [PATCH 09/30] use nvm --- .github/workflows/deploy-sandbox.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 036cbe503..4253d9a41 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -42,8 +42,8 @@ jobs: - name: Compile USWDS assets working-directory: ./src run: | - docker compose run node npm install -g node@21.7.3 && - docker compose run node npm install -g npm@10.5.0 && + nvm install 21.7.3 && + nvm use 21.7.3 && docker compose run node npm install && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile From 3865d8440c7a327e0fa0f4ccf024627cacf9b7df Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:23:09 -0600 Subject: [PATCH 10/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 4253d9a41..7be51fbba 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -42,6 +42,10 @@ jobs: - name: Compile USWDS assets working-directory: ./src run: | + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" nvm install 21.7.3 && nvm use 21.7.3 && docker compose run node npm install && From 04080d85f32c9fe847f5755ece1192b74bac7eb9 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:28:27 -0600 Subject: [PATCH 11/30] Use correct node version --- .github/workflows/deploy-sandbox.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 7be51fbba..77593b3d5 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -39,15 +39,13 @@ jobs: needs: [variables] steps: - uses: actions/checkout@v3 + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '21.7.3' - name: Compile USWDS assets working-directory: ./src run: | - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash - export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" - nvm install 21.7.3 && - nvm use 21.7.3 && docker compose run node npm install && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile From 66558ae80c39e8abc34ad975cbbcb0387d1c3773 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:34:00 -0600 Subject: [PATCH 12/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 77593b3d5..67a8e7476 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -40,13 +40,21 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup Node.js + working-directory: ./src uses: actions/setup-node@v4 with: node-version: '21.7.3' + cache: 'npm' + + - name: Prepare Node environment and install dependencies + working-directory: ./src + run: | + docker compose run node npm install -g npm@10.5.0 + docker compose run node npm install + - name: Compile USWDS assets working-directory: ./src run: | - docker compose run node npm install && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile - name: Collect static assets From e663dee659cf38183cb3dc7e086e9bc36934e2fe Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:35:58 -0600 Subject: [PATCH 13/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 67a8e7476..e7972454f 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -45,12 +45,10 @@ jobs: with: node-version: '21.7.3' cache: 'npm' - - - name: Prepare Node environment and install dependencies + - name: Prepare Node environment and adjust permissions working-directory: ./src run: | - docker compose run node npm install -g npm@10.5.0 - docker compose run node npm install + docker compose run node sh -c "chown circleci:circleci package*.json && npm install -g npm@10.5.0 && npm install" - name: Compile USWDS assets working-directory: ./src From 1313527b9d45f663d904326155de92e8a789087c Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:36:22 -0600 Subject: [PATCH 14/30] Remove cache --- .github/workflows/deploy-sandbox.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index e7972454f..b7798f858 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -44,7 +44,7 @@ jobs: uses: actions/setup-node@v4 with: node-version: '21.7.3' - cache: 'npm' + - name: Prepare Node environment and adjust permissions working-directory: ./src run: | From 9ca48c06d9f082e4ccf452c9bc0661fa0382e71f Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:38:00 -0600 Subject: [PATCH 15/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index b7798f858..6c9821112 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -44,15 +44,11 @@ jobs: uses: actions/setup-node@v4 with: node-version: '21.7.3' - - - name: Prepare Node environment and adjust permissions - working-directory: ./src - run: | - docker compose run node sh -c "chown circleci:circleci package*.json && npm install -g npm@10.5.0 && npm install" - - name: Compile USWDS assets working-directory: ./src run: | + docker compose run node npm install && + docker compose run node npm install npm@10.5.0 && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile - name: Collect static assets From 708c53b8cb49a61c91b0e97a6e69b5480f255841 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:38:44 -0600 Subject: [PATCH 16/30] Add correct spacing --- .github/workflows/deploy-sandbox.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 6c9821112..ec7e5623f 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -42,13 +42,17 @@ jobs: - name: Setup Node.js working-directory: ./src uses: actions/setup-node@v4 - with: - node-version: '21.7.3' + with: + node-version: '21.7.3' + + - name: Prepare Node environment and adjust permissions + working-directory: ./src + run: | + docker compose run node sh -c "chown circleci:circleci package*.json && npm install -g npm@10.5.0 && npm install" + - name: Compile USWDS assets working-directory: ./src run: | - docker compose run node npm install && - docker compose run node npm install npm@10.5.0 && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile - name: Collect static assets From bb24f723551c2485ee711ddfc4487e720aaba6af Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:43:59 -0600 Subject: [PATCH 17/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index ec7e5623f..b7798f858 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -42,8 +42,8 @@ jobs: - name: Setup Node.js working-directory: ./src uses: actions/setup-node@v4 - with: - node-version: '21.7.3' + with: + node-version: '21.7.3' - name: Prepare Node environment and adjust permissions working-directory: ./src From 0e66070e85ea9da09e870401c323def5e24ade1f Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:44:44 -0600 Subject: [PATCH 18/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index b7798f858..4dead7625 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -40,7 +40,6 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup Node.js - working-directory: ./src uses: actions/setup-node@v4 with: node-version: '21.7.3' From 3965c7d199c0d865c9a280739e61d0c84929ff4b Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:46:36 -0600 Subject: [PATCH 19/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 4dead7625..e8edb096a 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -44,14 +44,11 @@ jobs: with: node-version: '21.7.3' - - name: Prepare Node environment and adjust permissions - working-directory: ./src - run: | - docker compose run node sh -c "chown circleci:circleci package*.json && npm install -g npm@10.5.0 && npm install" - - name: Compile USWDS assets working-directory: ./src run: | + npm install && + docker compose run node npm install npm@10.5.0 && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile - name: Collect static assets From ad72c49de7fa043935ec4e4331478e47d237a97a Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:55:13 -0600 Subject: [PATCH 20/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index e8edb096a..45975cfa8 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -39,10 +39,10 @@ jobs: needs: [variables] steps: - uses: actions/checkout@v3 - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: '21.7.3' + - uses: actions/setup-node@v4 + with: + node-version: '21.7.3' + cache: 'npm' - name: Compile USWDS assets working-directory: ./src From 1d58ead3e1407e79774e567aab60ef797d1a1aa3 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:55:21 -0600 Subject: [PATCH 21/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 45975cfa8..93564efb7 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -40,9 +40,9 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v4 - with: - node-version: '21.7.3' - cache: 'npm' + with: + node-version: '21.7.3' + cache: 'npm' - name: Compile USWDS assets working-directory: ./src From 65635dc8e3d11eb75fffaee825afd17cdd42c6f2 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:55:47 -0600 Subject: [PATCH 22/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 93564efb7..62e27293e 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -47,7 +47,7 @@ jobs: - name: Compile USWDS assets working-directory: ./src run: | - npm install && + docker compose run node npm install && docker compose run node npm install npm@10.5.0 && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile From 596afdb6de3c902e1fc4dfe98aeea6f1b9b57cf7 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:57:20 -0600 Subject: [PATCH 23/30] Add cache dependency path --- .github/workflows/deploy-sandbox.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 62e27293e..916b8c6de 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -43,6 +43,7 @@ jobs: with: node-version: '21.7.3' cache: 'npm' + cache-dependency-path: ./src/package-lock.json - name: Compile USWDS assets working-directory: ./src From 6e06779c30efa1eeda72327126d168743e62242e Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:05:20 -0600 Subject: [PATCH 24/30] Update deploy-sandbox.yaml --- .github/workflows/deploy-sandbox.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 916b8c6de..d32cbb3e2 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -39,17 +39,11 @@ jobs: needs: [variables] steps: - uses: actions/checkout@v3 - - uses: actions/setup-node@v4 - with: - node-version: '21.7.3' - cache: 'npm' - cache-dependency-path: ./src/package-lock.json - - name: Compile USWDS assets working-directory: ./src run: | + docker compose run node npm install --global --force node@21.7.3 && docker compose run node npm install && - docker compose run node npm install npm@10.5.0 && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile - name: Collect static assets From 40795f2e47dfe7d9575e7423cb2de27d330f5ed6 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:07:22 -0600 Subject: [PATCH 25/30] Force install node version --- .github/workflows/deploy-sandbox.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index d32cbb3e2..2af58f716 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -42,8 +42,8 @@ jobs: - name: Compile USWDS assets working-directory: ./src run: | - docker compose run node npm install --global --force node@21.7.3 && docker compose run node npm install && + docker compose run node npm install --global --force node@21.7.3 && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile - name: Collect static assets From 75f3a1cca1ecc13365cb1edb3ce01f42170af437 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:19:40 -0600 Subject: [PATCH 26/30] Try nvm --- .github/workflows/deploy-sandbox.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 2af58f716..d53313e08 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -39,11 +39,20 @@ jobs: needs: [variables] steps: - uses: actions/checkout@v3 + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '21.7.3' - name: Compile USWDS assets working-directory: ./src run: | + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" + docker compose run node nvm install 21.7.3 && + docker compose run node nvm use 21.7.3 && docker compose run node npm install && - docker compose run node npm install --global --force node@21.7.3 && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile - name: Collect static assets From 4c6e555a054e2ecce81ebf14e8ea94e970daace1 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:21:24 -0600 Subject: [PATCH 27/30] Run nvm inside of docker shell --- .github/workflows/deploy-sandbox.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index d53313e08..5e76e2eb7 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -46,15 +46,16 @@ jobs: - name: Compile USWDS assets working-directory: ./src run: | - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash - export NVM_DIR="$HOME/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" - docker compose run node nvm install 21.7.3 && - docker compose run node nvm use 21.7.3 && - docker compose run node npm install && - docker compose run node npx gulp copyAssets && - docker compose run node npx gulp compile + docker compose run node bash -c "\ + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash && \ + export NVM_DIR=\"\$HOME/.nvm\" && \ + [ -s \"\$NVM_DIR/nvm.sh\" ] && \. \"\$NVM_DIR/nvm.sh\" && \ + [ -s \"\$NVM_DIR/bash_completion\" ] && \. \"\$NVM_DIR/bash_completion\" && \ + nvm install 21.7.3 && \ + nvm use 21.7.3 && \ + npm install && \ + npx gulp copyAssets && \ + npx gulp compile" - name: Collect static assets working-directory: ./src run: docker compose run app python manage.py collectstatic --no-input From 140735a7936a46a756693bf8552696854ec40c32 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:28:32 -0600 Subject: [PATCH 28/30] Remove setup node.js --- .github/workflows/deploy-sandbox.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 5e76e2eb7..ffad69abe 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -39,10 +39,6 @@ jobs: needs: [variables] steps: - uses: actions/checkout@v3 - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: '21.7.3' - name: Compile USWDS assets working-directory: ./src run: | From 7848a6e6e5fa0ea1f8c0bf09f1b85049ae1d541b Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:33:48 -0600 Subject: [PATCH 29/30] Add bash script for each yaml --- .github/workflows/deploy-development.yaml | 13 ++++++++++--- .github/workflows/deploy-stable.yaml | 13 ++++++++++--- .github/workflows/deploy-staging.yaml | 13 ++++++++++--- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-development.yaml b/.github/workflows/deploy-development.yaml index 686635c20..12a1b5861 100644 --- a/.github/workflows/deploy-development.yaml +++ b/.github/workflows/deploy-development.yaml @@ -22,9 +22,16 @@ jobs: - name: Compile USWDS assets working-directory: ./src run: | - docker compose run node npm install && - docker compose run node npx gulp copyAssets && - docker compose run node npx gulp compile + docker compose run node bash -c "\ + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash && \ + export NVM_DIR=\"\$HOME/.nvm\" && \ + [ -s \"\$NVM_DIR/nvm.sh\" ] && \. \"\$NVM_DIR/nvm.sh\" && \ + [ -s \"\$NVM_DIR/bash_completion\" ] && \. \"\$NVM_DIR/bash_completion\" && \ + nvm install 21.7.3 && \ + nvm use 21.7.3 && \ + npm install && \ + npx gulp copyAssets && \ + npx gulp compile" - name: Collect static assets working-directory: ./src run: docker compose run app python manage.py collectstatic --no-input diff --git a/.github/workflows/deploy-stable.yaml b/.github/workflows/deploy-stable.yaml index 0ded4a3a6..9d0573e01 100644 --- a/.github/workflows/deploy-stable.yaml +++ b/.github/workflows/deploy-stable.yaml @@ -23,9 +23,16 @@ jobs: - name: Compile USWDS assets working-directory: ./src run: | - docker compose run node npm install && - docker compose run node npx gulp copyAssets && - docker compose run node npx gulp compile + docker compose run node bash -c "\ + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash && \ + export NVM_DIR=\"\$HOME/.nvm\" && \ + [ -s \"\$NVM_DIR/nvm.sh\" ] && \. \"\$NVM_DIR/nvm.sh\" && \ + [ -s \"\$NVM_DIR/bash_completion\" ] && \. \"\$NVM_DIR/bash_completion\" && \ + nvm install 21.7.3 && \ + nvm use 21.7.3 && \ + npm install && \ + npx gulp copyAssets && \ + npx gulp compile" - name: Collect static assets working-directory: ./src run: docker compose run app python manage.py collectstatic --no-input diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml index 1df08f412..ad4a437c1 100644 --- a/.github/workflows/deploy-staging.yaml +++ b/.github/workflows/deploy-staging.yaml @@ -23,9 +23,16 @@ jobs: - name: Compile USWDS assets working-directory: ./src run: | - docker compose run node npm install && - docker compose run node npx gulp copyAssets && - docker compose run node npx gulp compile + docker compose run node bash -c "\ + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash && \ + export NVM_DIR=\"\$HOME/.nvm\" && \ + [ -s \"\$NVM_DIR/nvm.sh\" ] && \. \"\$NVM_DIR/nvm.sh\" && \ + [ -s \"\$NVM_DIR/bash_completion\" ] && \. \"\$NVM_DIR/bash_completion\" && \ + nvm install 21.7.3 && \ + nvm use 21.7.3 && \ + npm install && \ + npx gulp copyAssets && \ + npx gulp compile" - name: Collect static assets working-directory: ./src run: docker compose run app python manage.py collectstatic --no-input From 51c1baf0e04f1789c2885fc85cdcfb6b6fbe0524 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:35:11 -0600 Subject: [PATCH 30/30] Update node.Dockerfile --- src/node.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node.Dockerfile b/src/node.Dockerfile index cf0b6acc6..9178f8862 100644 --- a/src/node.Dockerfile +++ b/src/node.Dockerfile @@ -9,4 +9,4 @@ COPY --chown=circleci:circleci package*.json ./ RUN npm install -g npm@10.5.0 -RUN npm install \ No newline at end of file +RUN npm install