From 3d6f8af01ab3e867e2b39a5fae7341ddf5745797 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 13 Dec 2024 09:44:32 +0000 Subject: [PATCH] HPCC-32379: Upgrade for latest GH Action Runners Signed-off-by: Gordon Smith --- .github/workflows/build-vcpkg.yml | 11 +---------- vcpkg | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml index 7992beac6cd..368b3910954 100644 --- a/.github/workflows/build-vcpkg.yml +++ b/.github/workflows/build-vcpkg.yml @@ -198,17 +198,8 @@ jobs: cmake-configuration-ex: '-T host=x64 -A x64 -DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF' secrets: inherit - build-gh_runner-macos-14: - if: ${{ contains('pull_request,push', github.event_name) }} - uses: ./.github/workflows/build-gh_runner.yml - with: - os: macos-14 - build-type: 'Release' - cmake-configuration-ex: '-DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DSUPPRESS_CASSANDRAEMBED=ON -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF' - secrets: inherit - build-gh_runner-macos-13: - if: ${{ contains('schedule,push', github.event_name) }} + if: ${{ contains('pull_request,push', github.event_name) }} uses: ./.github/workflows/build-gh_runner.yml with: os: macos-13 diff --git a/vcpkg b/vcpkg index 70ea56ab7b2..5ff6ea5ea7c 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 70ea56ab7b2ec07bfed8b6170cecdd85b2e36fe0 +Subproject commit 5ff6ea5ea7c5e0f23e8632920c11e963390051c1