diff --git a/.devcontainer/swift/devcontainer.json b/.devcontainer/swift/devcontainer.json index 97cd1bd022a2..5683bfb592e0 100644 --- a/.devcontainer/swift/devcontainer.json +++ b/.devcontainer/swift/devcontainer.json @@ -1,25 +1,28 @@ { - "extensions": [ - "github.vscode-codeql", - "hbenl.vscode-test-explorer", - "ms-vscode.test-adapter-converter", - "slevesque.vscode-zipexplorer", - "ms-vscode.cpptools" - ], - "settings": { - "files.watcherExclude": { - "**/target/**": true - }, - "codeQL.runningQueries.memory": 2048 - }, - "build": { - "dockerfile": "Dockerfile", - }, - "runArgs": [ - "--cap-add=SYS_PTRACE", - "--security-opt", - "seccomp=unconfined" - ], - "remoteUser": "vscode", - "onCreateCommand": ".devcontainer/swift/user.sh" + "extensions": [ + "github.vscode-codeql", + "hbenl.vscode-test-explorer", + "ms-vscode.test-adapter-converter", + "slevesque.vscode-zipexplorer", + "ms-vscode.cpptools" + ], + "features": { + "git-lfs": "latest" + }, + "settings": { + "files.watcherExclude": { + "**/target/**": true + }, + "codeQL.runningQueries.memory": 2048 + }, + "build": { + "dockerfile": "Dockerfile", + }, + "runArgs": [ + "--cap-add=SYS_PTRACE", + "--security-opt", + "seccomp=unconfined" + ], + "remoteUser": "vscode", + "onCreateCommand": ".devcontainer/swift/user.sh" } diff --git a/.devcontainer/swift/root.sh b/.devcontainer/swift/root.sh index 33ffba0a741c..983435c209b4 100755 --- a/.devcontainer/swift/root.sh +++ b/.devcontainer/swift/root.sh @@ -3,9 +3,6 @@ set -xe BAZELISK_VERSION=v1.12.0 BAZELISK_DOWNLOAD_SHA=6b0bcb2ea15bca16fffabe6fda75803440375354c085480fe361d2cbf32501db -# install git lfs apt source -curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash - # install gh apt source (type -p wget >/dev/null || (sudo apt update && sudo apt-get install wget -y)) \ && sudo mkdir -p -m 755 /etc/apt/keyrings \ @@ -21,7 +18,6 @@ apt-get -y install --no-install-recommends \ python3-distutils \ python3-pip \ bash-completion \ - git-lfs \ gh # Install Bazel diff --git a/.devcontainer/swift/user.sh b/.devcontainer/swift/user.sh index 1de3485a723b..fbf8aca57a71 100755 --- a/.devcontainer/swift/user.sh +++ b/.devcontainer/swift/user.sh @@ -1,7 +1,5 @@ set -xe -git lfs install - # add the workspace to the codeql search path mkdir -p /home/vscode/.config/codeql echo "--search-path /workspaces/codeql" > /home/vscode/.config/codeql/config