From 20c8afaace298261ede74b83546f7a32d332db0c Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Thu, 18 Jul 2024 14:27:31 -0700 Subject: [PATCH 1/3] Remove version --- src/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/docker-compose.yml b/src/docker-compose.yml index 39282ff96..d64ba80d5 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.0" services: app: build: . From 4d25aeb41ff5b181de861bc5b8d3ae51cb0dddb2 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Thu, 18 Jul 2024 14:54:08 -0700 Subject: [PATCH 2/3] npm load fix --- .github/workflows/deploy-branch-to-sandbox.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-branch-to-sandbox.yaml b/.github/workflows/deploy-branch-to-sandbox.yaml index 14a3d8ef8..00291c8a2 100644 --- a/.github/workflows/deploy-branch-to-sandbox.yaml +++ b/.github/workflows/deploy-branch-to-sandbox.yaml @@ -53,6 +53,7 @@ jobs: - name: Compile USWDS assets working-directory: ./src run: | + docker compose run node npm install npm@latest && docker compose run node npm install && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile From 07727bfdd59ce9628a85eea7e151b621365dfa77 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Fri, 19 Jul 2024 08:04:23 -0700 Subject: [PATCH 3/3] Adding change for sandbox and development --- .github/workflows/deploy-development.yaml | 3 ++- .github/workflows/deploy-sandbox.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-development.yaml b/.github/workflows/deploy-development.yaml index 03994e1de..fa447ed76 100644 --- a/.github/workflows/deploy-development.yaml +++ b/.github/workflows/deploy-development.yaml @@ -22,7 +22,8 @@ jobs: - name: Compile USWDS assets working-directory: ./src run: | - docker compose run node npm install && + docker compose run node npm install npm@latest && + docker compose run node npm install && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile - name: Collect static assets diff --git a/.github/workflows/deploy-sandbox.yaml b/.github/workflows/deploy-sandbox.yaml index 4bd7f99dd..57561919c 100644 --- a/.github/workflows/deploy-sandbox.yaml +++ b/.github/workflows/deploy-sandbox.yaml @@ -47,7 +47,8 @@ jobs: - name: Compile USWDS assets working-directory: ./src run: | - docker compose run node npm install && + docker compose run node npm install npm@latest && + docker compose run node npm install && docker compose run node npx gulp copyAssets && docker compose run node npx gulp compile - name: Collect static assets