diff options
| author |  Sam Hughes <sam@samuelhughes.com>
| 2022-12-28 22:53:07 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-12-28 22:53:07 -0800 |
| commit | 79a2f81447d477f47730f8d5be6479ec4bd4340a (patch) | |
| tree | 68da386be8e323b431e8fef3b674e219417c3673 | |
| parent | 0504bb89848255c64bee3ba5a36601444de0c97c (diff) | |
| download | bun-79a2f81447d477f47730f8d5be6479ec4bd4340a.tar.gz bun-79a2f81447d477f47730f8d5be6479ec4bd4340a.tar.zst bun-79a2f81447d477f47730f8d5be6479ec4bd4340a.zip | |
Fix devcontainer (tested) (#1680)
zls changes may be imprecise.
| -rw-r--r-- | .devcontainer/scripts/zig-env.sh | 5 | ||||
| -rw-r--r-- | Dockerfile.devcontainer | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.devcontainer/scripts/zig-env.sh b/.devcontainer/scripts/zig-env.sh index a9a0d95b5..c9dd6131b 100644 --- a/.devcontainer/scripts/zig-env.sh +++ b/.devcontainer/scripts/zig-env.sh @@ -1,7 +1,8 @@ #!/bin/bash -curl -L https://github.com/Jarred-Sumner/vscode-zig/releases/download/march18/zig-0.2.5.vsix >/home/ubuntu/vscode-zig.vsix -git clone https://github.com/oven-sh/zls /home/ubuntu/zls +curl -L https://github.com/zigtools/zls-vscode/releases/download/1.1.6/zls-vscode-1.1.6.vsix >/home/ubuntu/vscode-zig.vsix +git clone https://github.com/zigtools/zls /home/ubuntu/zls cd /home/ubuntu/zls +git checkout aabdb0c6ecb3c9a47feff2c2bfb9be4e95adf723 git submodule update --init --recursive --progress --depth=1 zig build -Drelease-fast diff --git a/Dockerfile.devcontainer b/Dockerfile.devcontainer index 9dc8335f8..4ea0285e0 100644 --- a/Dockerfile.devcontainer +++ b/Dockerfile.devcontainer @@ -96,7 +96,7 @@ ARG ZIG_URL ADD $ZIG_URL . RUN tar -xf ${ZIG_FILENAME} && \ rm ${ZIG_FILENAME} && \ - mv ${ZIG_FOLDERNAME} ${GITHUB_WORKSPACE}/; + mv ${ZIG_FOLDERNAME} ${ZIG_PATH}; RUN cd $GITHUB_WORKSPACE && \ curl -o bun-webkit-linux-$BUILDARCH.tar.gz -L https://github.com/oven-sh/WebKit/releases/download/dec17/bun-webkit-linux-$BUILDARCH.tar.gz && \ |