From a07b1869fdc88b538a29692de2b172c5eae0c0e6 Mon Sep 17 00:00:00 2001 From: Dominic Griesel Date: Wed, 11 Dec 2024 23:29:03 +0000 Subject: [PATCH 1/4] fix: avoid cross-link issues in devcontainer --- .devcontainer/devcontainer.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 62b4ddf4d594..6f3c6247b68e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,10 +1,12 @@ { "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18", "containerEnv": { - "YARN_ENABLE_GLOBAL_CACHE": "false", // Avoids cross-link issues due to different filesystems between /home and /workspaces - "COREPACK_ENABLE_DOWNLOAD_PROMPT": "0" // Avoids interactive prompt causing container creation to hang + // Avoids cross-link issues due to different filesystems between /home and /workspaces + "YARN_GLOBAL_FOLDER": "/workspaces/node-zwave-js/.yarn/global", + "YARN_ENABLE_GLOBAL_CACHE": "false", + // Avoids interactive prompt causing container creation to hang + "COREPACK_ENABLE_DOWNLOAD_PROMPT": "0" }, - "updateContentCommand": "sudo corepack enable && yarn && yarn bootstrap", "customizations": { "vscode": { From 6b6d43b6df249e6e26cf9dc98cf2ef524d2a6078 Mon Sep 17 00:00:00 2001 From: Dominic Griesel Date: Thu, 12 Dec 2024 11:24:27 +0100 Subject: [PATCH 2/4] fix: gitpod builds --- .gitpod.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 41f1305f96cd..e5a37e292649 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,7 +1,12 @@ # Commands to start on workspace startup -# For reference, these env variables are set in the project settings: -# - YARN_CACHE_FOLDER=".yarn/cache" -# - YARN_ENABLE_GLOBAL_CACHE="false" +env: + # Avoids cross-link issues due to different filesystems between /home and /workspaces + YARN_GLOBAL_FOLDER: ".yarn/global" + YARN_CACHE_FOLDER: ".yarn/cache" + YARN_ENABLE_GLOBAL_CACHE: "false" + # Avoids interactive prompt causing container creation to hang + COREPACK_ENABLE_DOWNLOAD_PROMPT: "0" + tasks: - init: | yarn install From 22652fb9b060732ac4b9cf8da0362fe319cd28ff Mon Sep 17 00:00:00 2001 From: Dominic Griesel Date: Thu, 12 Dec 2024 11:26:26 +0100 Subject: [PATCH 3/4] fix: gitpod init commands --- .gitpod.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index e5a37e292649..ce7e2285f3c2 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -9,8 +9,9 @@ env: tasks: - init: | - yarn install - yarn build + corepack enable + yarn + yarn bootstrap command: | bash .gitpod/setup-git.sh gp sync-done prepare From 3fde66fc06650c1a6c0db0a82b79c41eb3d577e8 Mon Sep 17 00:00:00 2001 From: Dominic Griesel Date: Thu, 12 Dec 2024 11:31:47 +0100 Subject: [PATCH 4/4] style: fix formatting --- .gitpod.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index ce7e2285f3c2..ef4478947b2d 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,11 +1,11 @@ # Commands to start on workspace startup env: # Avoids cross-link issues due to different filesystems between /home and /workspaces - YARN_GLOBAL_FOLDER: ".yarn/global" - YARN_CACHE_FOLDER: ".yarn/cache" - YARN_ENABLE_GLOBAL_CACHE: "false" + YARN_GLOBAL_FOLDER: '.yarn/global' + YARN_CACHE_FOLDER: '.yarn/cache' + YARN_ENABLE_GLOBAL_CACHE: 'false' # Avoids interactive prompt causing container creation to hang - COREPACK_ENABLE_DOWNLOAD_PROMPT: "0" + COREPACK_ENABLE_DOWNLOAD_PROMPT: '0' tasks: - init: |