circleci: update cache, port list

luncliff · Sep 27, 2023 · f987a8d · f987a8d
1 parent 4557985
commit f987a8d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -45,10 +45,10 @@ jobs:
             Pop-Location
       - restore_cache:
           keys:
-            - 2326-downs-{{ checksum ".circleci/config.yml" }}
+            - v2338-downs-{{ checksum ".circleci/config.yml" }}
       - restore_cache:
           keys:
-            - 2326-bins-{{ checksum ".circleci/config.yml" }}
+            - v2338-bins-{{ checksum ".circleci/config.yml" }}
       - run:
           name: "Install: port-setup.txt"
           command: |
@@ -59,12 +59,12 @@ jobs:
               $(Get-Content "$env:CIRCLE_WORKING_DIRECTORY/.circleci/port-setup.txt")
           working_directory: vcpkg
       - save_cache:
-          key: 2326-downs-{{ checksum ".circleci/config.yml" }}
+          key: v2338-downs-{{ checksum ".circleci/config.yml" }}
           paths:
             - C:/vcpkg-downs
           when: always
       - save_cache:
-          key: 2326-bins-{{ checksum ".circleci/config.yml" }}
+          key: v2338-bins-{{ checksum ".circleci/config.yml" }}
           paths:
             - C:/vcpkg-bins
           when: always
@@ -91,16 +91,10 @@ jobs:
             Pop-Location
       - restore_cache:
           keys:
-            - 2326-downs-{{ checksum ".circleci/config.yml" }}
+            - v2338-downs-{{ checksum ".circleci/config.yml" }}
       - restore_cache:
           keys:
-            - 2326-bins-{{ checksum ".circleci/config.yml" }}
-      - restore_cache:
-          keys:
-            - 2338-downs-{{ checksum ".circleci/config.yml" }}
-      - restore_cache:
-          keys:
-            - 2338-bins-{{ checksum ".circleci/config.yml" }}
+            - v2338-bins-{{ checksum ".circleci/config.yml" }}
       - run:
           name: "Install: port-windows.txt"
           command: |
@@ -116,16 +110,16 @@ jobs:
             equal: [ main, << pipeline.git.branch >> ]
           steps:
            - save_cache:
-              key: 2338-bins-{{ .Branch }}
+              key: v2338-bins-{{ .Branch }}
               paths:
                 - C:/vcpkg-bins
       - save_cache:
-          key: 2338-downs-{{ checksum ".circleci/config.yml" }}
+          key: v2338-downs-{{ checksum ".circleci/config.yml" }}
           paths:
             - C:/vcpkg-downs
           when: always
       - save_cache:
-          key: 2338-bins-{{ checksum ".circleci/config.yml" }}
+          key: v2338-bins-{{ checksum ".circleci/config.yml" }}
           paths:
             - C:/vcpkg-bins
           when: always

diff --git a/.circleci/port-setup.txt b/.circleci/port-setup.txt
@@ -11,3 +11,10 @@ zstd:x64-windows
 draco:x64-windows
 civetweb:x64-windows
 cgltf:x64-windows
+protobuf[zlib]:x64-windows
+grpc[codegen]:x64-windows
+flatbuffers:x64-windows
+opencl:x64-windows
+egl-registry:x64-windows
+opengl-registry:x64-windows
+vulkan-headers:x64-windows
diff --git a/.circleci/port-uwp.txt b/.circleci/port-uwp.txt
@@ -1,2 +1 @@
 onnxruntime[xnnpack]:x64-uwp
-onnxruntime[directml,xnnpack]:x64-windows