From cf1d6422131a606c25d0a7516e7f8ce1d2c4cf82 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Thu, 19 Oct 2023 11:59:56 +0000 Subject: [PATCH] Rebase vcpkg (#16) * Rebase vcpkg Closes #15. --- .github/workflows/build-and-test.yml | 6 +++++- vcpkg | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index de8c202..f2ee0a0 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -14,7 +14,6 @@ jobs: build: strategy: fail-fast: false - max-parallel: 1 matrix: os: ['windows-2022', 'ubuntu-22.04'] vcpkg_library_linkage: ['dynamic', 'static'] @@ -48,6 +47,11 @@ jobs: BUILD_TYPE: ${{ matrix.build_type }} steps: + - name: Update ubuntu repository + if: ${{ matrix.os == 'ubuntu-22.04' }} + shell: bash + run: sudo apt-get update + - name: Install ubuntu icu dependencies if: ${{ matrix.os == 'ubuntu-22.04' }} shell: bash diff --git a/vcpkg b/vcpkg index 5970672..10d09ce 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 59706727019979fd46e47a20ff08c65890fe4236 +Subproject commit 10d09cebe2d78e3f32d3bca4177517ff292ad6a9