From ff18e2c94188980334ae569f4dca9f8a4d811e25 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 25 May 2023 00:20:45 +0000 Subject: [PATCH 1/5] Use `setfacl` to make Codespaces respect `umask` --- .devcontainer/devcontainer.json | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9fbaf7fddd8514..fbb1725973e13c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -9,7 +9,9 @@ "-y", "which", "zsh", - "fish" + "fish", + // For umask fix below. + "/usr/bin/setfacl" ], "updateContentCommand": { // Using the shell for `nproc` usage. @@ -20,7 +22,10 @@ "Doc", "venv", "html" - ] + ], + // https://github.com/orgs/community/discussions/26026 + //"umask fix": "sudo setfacl -bnR . && sudo setfacl -bn /tmp" + "umask fix": ["sudo", "setfacl", "-bnR", "."] }, "customizations": { "vscode": { @@ -32,9 +37,9 @@ // C auto-complete. "ms-vscode.cpptools", // To view built docs. - "ms-vscode.live-server" - // https://github.com/microsoft/vscode-python/issues/18073 - // "ms-python.python" + "ms-vscode.live-server", + // Python auto-complete. + "ms-python.python" ], "settings": { "C_Cpp.default.compilerPath": "/usr/bin/clang", From eb3e459486c32b630221065f71077a8a3744b014 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 25 May 2023 01:01:40 +0000 Subject: [PATCH 2/5] Make umask-based tests work with Codespaces --- .devcontainer/devcontainer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index fbb1725973e13c..8131e3969880bd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -24,8 +24,8 @@ "html" ], // https://github.com/orgs/community/discussions/26026 - //"umask fix": "sudo setfacl -bnR . && sudo setfacl -bn /tmp" - "umask fix": ["sudo", "setfacl", "-bnR", "."] + "umask fix: workspace": ["sudo", "setfacl", "-bnR", "."], + "umask fix: /tmp": ["sudo", "setfacl", "-bnR", "/tmp"] }, "customizations": { "vscode": { @@ -36,7 +36,7 @@ "maelvalais.autoconf", // C auto-complete. "ms-vscode.cpptools", - // To view built docs. + // To view HTML build of docs. "ms-vscode.live-server", // Python auto-complete. "ms-python.python" From 82386889a408c8eac603a6bf23172cd14e5684fd Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 25 May 2023 09:06:25 -0700 Subject: [PATCH 3/5] Switch umask fixes to be a `postCreateCommand` step --- .devcontainer/devcontainer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8131e3969880bd..0dc303015df5c7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -22,7 +22,9 @@ "Doc", "venv", "html" - ], + ] + }, + "postCreateCommand": { // https://github.com/orgs/community/discussions/26026 "umask fix: workspace": ["sudo", "setfacl", "-bnR", "."], "umask fix: /tmp": ["sudo", "setfacl", "-bnR", "/tmp"] From d3b897f35b9640a4a413b624c4746c201330ab6b Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 25 May 2023 11:24:40 -0700 Subject: [PATCH 4/5] Bump the WASI SDK to 20 --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index efbdcd402cdf67..5b5eb4db99faeb 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,7 +2,7 @@ FROM docker.io/library/fedora:37 ENV CC=clang -ENV WASI_SDK_VERSION=19 +ENV WASI_SDK_VERSION=20 ENV WASI_SDK_PATH=/opt/wasi-sdk ENV WASMTIME_HOME=/opt/wasmtime From a88a6a112300ad6ef17b012028c6fa6277ba3b5f Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 25 May 2023 11:32:41 -0700 Subject: [PATCH 5/5] Bump wasmtime version --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 5b5eb4db99faeb..590d7834b2b8be 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,7 +6,7 @@ ENV WASI_SDK_VERSION=20 ENV WASI_SDK_PATH=/opt/wasi-sdk ENV WASMTIME_HOME=/opt/wasmtime -ENV WASMTIME_VERSION=7.0.0 +ENV WASMTIME_VERSION=9.0.1 ENV WASMTIME_CPU_ARCH=x86_64 RUN dnf -y --nodocs --setopt=install_weak_deps=False install /usr/bin/{blurb,clang,curl,git,ln,tar,xz} 'dnf-command(builddep)' && \