summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2023-05-25 20:03:55 (GMT)
committerGitHub <noreply@github.com>2023-05-25 20:03:55 (GMT)
commit08888650aa03e285a97f84f34c2629ec8a8a8681 (patch)
tree10a18339f0b7985ffc27851852369a8049e64f23
parent2b7027d0b2ee2e102a24a0da27d01b8221f9351c (diff)
downloadcpython-08888650aa03e285a97f84f34c2629ec8a8a8681.zip
cpython-08888650aa03e285a97f84f34c2629ec8a8a8681.tar.gz
cpython-08888650aa03e285a97f84f34c2629ec8a8a8681.tar.bz2
Fix umask test failures under Codespaces (#104913)
Also turn on the Python extension for Python code completions and bump the installed versions of wasmtime and the WASI SDK.
-rw-r--r--.devcontainer/Dockerfile4
-rw-r--r--.devcontainer/devcontainer.json17
2 files changed, 14 insertions, 7 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index efbdcd4..590d783 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -2,11 +2,11 @@ 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
-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)' && \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 9fbaf7f..0dc3030 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.
@@ -22,6 +24,11 @@
"html"
]
},
+ "postCreateCommand": {
+ // https://github.com/orgs/community/discussions/26026
+ "umask fix: workspace": ["sudo", "setfacl", "-bnR", "."],
+ "umask fix: /tmp": ["sudo", "setfacl", "-bnR", "/tmp"]
+ },
"customizations": {
"vscode": {
"extensions": [
@@ -31,10 +38,10 @@
"maelvalais.autoconf",
// 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"
+ // To view HTML build of docs.
+ "ms-vscode.live-server",
+ // Python auto-complete.
+ "ms-python.python"
],
"settings": {
"C_Cpp.default.compilerPath": "/usr/bin/clang",