HPCC-32379: Upgrade for latest GH Action Runners

Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Dec 13, 2024 · 3d6f8af · 3d6f8af
1 parent e40bfee
commit 3d6f8af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git 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
+17 −8		.github/workflows/prebuild-gh_envs.yml
+130 −0		vcpkg-win2022.json