diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 73f6119c55..93567edc9e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -68,16 +68,9 @@ jobs: - name: Install dependencies (Windows) if: runner.os == 'Windows' run: | - # shellcheck disable=SC2028 - { - echo C:/msys64/usr/bin - echo C:/msys64/mingw64/bin - } >> "$GITHUB_PATH" - /c/msys64/usr/bin/pacman -S --noconfirm mingw-w64-x86_64-nss mingw-w64-x86_64-pkg-config + vcpkg install nss # See https://github.com/ilammy/msvc-dev-cmd#name-conflicts-with-shell-bash rm /usr/bin/link.exe - rm C:/msys64/usr/bin/link.exe - find C:/msys64/mingw64/lib - name: Set up MSVC build environment (Windows) if: runner.os == 'Windows' diff --git a/qns/Dockerfile b/qns/Dockerfile index d07e04505b..789a41d72c 100644 --- a/qns/Dockerfile +++ b/qns/Dockerfile @@ -30,6 +30,7 @@ ADD . /neqo RUN set -eux; \ cd /neqo; \ + export PATH=/home/linuxbrew/.linuxbrew/bin:$PATH; \ cargo build --release --bin neqo-client --bin neqo-server # Copy only binaries to the final image to keep it small.