Clean install and CI mode

Signed-off-by: Benoit Donneaux <benoit@leastauthority.com>
LeastAuthority · Feb 2, 2024 · aacaf03 · aacaf03
1 parent 4884920
commit aacaf03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -72,7 +72,7 @@ jobs:
       - name: Prepare containers
         run: |
           docker compose build --build-arg uid="$(id -u)" --build-arg gid="$(id -g)" client
-          docker compose run --no-deps client npm i
+          docker compose run --no-deps -e CI=true client npm clean-install
 
       - name: Deploy package
         run: docker compose run --no-deps client npm run deploy

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
@@ -89,13 +89,14 @@ jobs:
           # Build images if any client is missing
           test $CLIENT -eq 0 -a $CLIENT_E2E -eq 0 || \
             docker compose --progress plain -f docker-compose.yml -f docker-compose.e2e.yml --profile e2e \
-            build --build-arg uid=$(id -u) --build-arg gid=${_GID}
+              build --build-arg uid=$(id -u) --build-arg gid=${_GID}
 
       - name: Setup containers
         run: |
-          docker compose run --rm --no-deps client npm i
+          docker compose run --rm --no-deps -e CI=true client npm clean-install
           docker compose run --rm --no-deps client ./scripts/setup.sh
-          docker compose -f docker-compose.yml -f docker-compose.e2e.yml --profile e2e run --rm --no-deps client-e2e npm i
+          docker compose -f docker-compose.yml -f docker-compose.e2e.yml --profile e2e \
+            run --rm --no-deps -e CI=true client-e2e npm clean-installed
 
       - name: Start devserver
         run: |
@@ -113,7 +114,8 @@ jobs:
 
       - name: Run END-2-END tests
         run: |
-          docker compose --progress plain -f docker-compose.yml -f docker-compose.e2e.yml --profile e2e run --rm client-e2e
+          docker compose --progress plain -f docker-compose.yml -f docker-compose.e2e.yml --profile e2e \
+            run --rm client-e2e
 
       - name: Stop containers
         run: docker compose -f docker-compose.yml -f docker-compose.e2e.yml --profile e2e down