From 69eefd772705b281dc42f63a8eaeb637b355b840 Mon Sep 17 00:00:00 2001 From: Migelo Date: Thu, 22 Feb 2024 19:47:05 +0100 Subject: [PATCH] Fix devcontainer and update vcpkg for tests (#621) * Update devcontainer.json to debian-11 * update vcpkg to fix windows build --- .devcontainer/devcontainer.json | 2 +- external/vcpkg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 762900706..3756343bc 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,7 @@ "dockerfile": "Dockerfile", // Update 'VARIANT' to pick an Debian / Ubuntu OS version: debian-11, debian-10, debian-9, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04 // Use Debian 11, Debian 9, Ubuntu 18.04 or Ubuntu 21.04 on local arm64/Apple Silicon - "args": { "VARIANT": "ubuntu-21.04" } + "args": { "VARIANT": "debian-11" } }, "runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"], diff --git a/external/vcpkg b/external/vcpkg index ae59b93af..4a3c366f2 160000 --- a/external/vcpkg +++ b/external/vcpkg @@ -1 +1 @@ -Subproject commit ae59b93af0c1dce4126e963fca5b330662495fa1 +Subproject commit 4a3c366f2d0d0eaf034bfa649124768df7cfe813