ci: prepare release v2352

luncliff · Dec 26, 2023 · 9202e4d · 9202e4d
1 parent c5af90f
commit 9202e4d
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 75 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -35,27 +35,27 @@ jobs:
     steps:
       - checkout
       - run:
-          name: "Setup: microsoft/vcpkg(2023.11.20)"
+          name: "Setup: microsoft/vcpkg(2023.12.12)"
           command: |
             New-Item -Type Directory -Force -Path $env:VCPKG_DOWNLOADS
             New-Item -Type Directory -Force -Path $env:VCPKG_DEFAULT_BINARY_CACHE
-            git clone --branch=2023.11.20 --depth=1 https://github.com/microsoft/vcpkg
+            git clone --branch=2023.12.12 --depth=1 https://github.com/microsoft/vcpkg
             Push-Location vcpkg
               ./bootstrap-vcpkg.bat
               ./vcpkg.exe --version
             Pop-Location
       - restore_cache:
           keys:
-            - v2351-downs-{{ .Branch }}
-            - v2351-downs-{{ checksum ".circleci/config.yml" }}
-            - v2351-downs-main
-            - v2351-downs-main
+            - v2352-downs-{{ .Branch }}
+            - v2352-downs-{{ checksum ".circleci/config.yml" }}
+            - v2352-downs-main
+            - v2352-downs-main
       - restore_cache:
           keys:
-            - v2351-bins-{{ .Branch }}
-            - v2351-bins-{{ checksum ".circleci/config.yml" }}
-            - v2351-bins-main
-            - v2351-bins-main
+            - v2352-bins-{{ .Branch }}
+            - v2352-bins-{{ checksum ".circleci/config.yml" }}
+            - v2352-bins-main
+            - v2352-bins-main
       - run:
           name: "Install: port-setup.txt"
           command: |
@@ -65,14 +65,14 @@ jobs:
               --overlay-ports="$env:CIRCLE_WORKING_DIRECTORY/ports" `
               $(Get-Content "$env:CIRCLE_WORKING_DIRECTORY/.circleci/port-setup.txt")
           working_directory: vcpkg
-          no_output_timeout: 1h
+          no_output_timeout: 3h
       - save_cache:
-          key: v2351-downs-{{ checksum ".circleci/config.yml" }}
+          key: v2352-downs-{{ checksum ".circleci/config.yml" }}
           paths:
             - C:/vcpkg-downs
           when: always
       - save_cache:
-          key: v2351-bins-{{ checksum ".circleci/config.yml" }}
+          key: v2352-bins-{{ checksum ".circleci/config.yml" }}
           paths:
             - C:/vcpkg-bins
           when: always
@@ -88,51 +88,52 @@ jobs:
     steps:
       - checkout
       - run:
-          name: "Setup: microsoft/vcpkg(2023.11.20)"
+          name: "Setup: microsoft/vcpkg(2023.12.12)"
           command: |
             New-Item -Type Directory -Force -Path $env:VCPKG_DOWNLOADS
             New-Item -Type Directory -Force -Path $env:VCPKG_DEFAULT_BINARY_CACHE
-            git clone --branch=2023.11.20 --depth=1 https://github.com/microsoft/vcpkg
+            git clone --branch=2023.12.12 --depth=1 https://github.com/microsoft/vcpkg
             Push-Location vcpkg
               ./bootstrap-vcpkg.bat
               ./vcpkg.exe --version
             Pop-Location
       - restore_cache:
           keys:
-            - v2351-downs-{{ .Branch }}
-            - v2351-downs-{{ checksum ".circleci/config.yml" }}
-            - v2351-downs-main
-            - v2351-downs-main
+            - v2352-downs-{{ .Branch }}
+            - v2352-downs-{{ checksum ".circleci/config.yml" }}
+            - v2352-downs-main
+            - v2352-downs-main
       - restore_cache:
           keys:
-            - v2351-bins-{{ .Branch }}
-            - v2351-bins-{{ checksum ".circleci/config.yml" }}
-            - v2351-bins-main
-            - v2351-bins-main
+            - v2352-bins-{{ .Branch }}
+            - v2352-bins-{{ checksum ".circleci/config.yml" }}
+            - v2352-bins-main
+            - v2352-bins-main
       - run:
           name: "Install: port-windows.txt"
           command: |
             ./vcpkg.exe install `
+              --recurse `
               --clean-buildtrees-after-build `
               --clean-packages-after-build `
               --overlay-ports="$env:CIRCLE_WORKING_DIRECTORY/ports" `
               $(Get-Content "$env:CIRCLE_WORKING_DIRECTORY/.circleci/port-windows.txt")
           working_directory: vcpkg
-          no_output_timeout: 1h
+          no_output_timeout: 5h
       - when:
           condition:
             equal: [ main, << pipeline.git.branch >> ]
           steps:
            - save_cache:
-              key: v2351-bins-{{ .Branch }}
+              key: v2352-bins-{{ .Branch }}
               paths:
                 - C:/vcpkg-bins
       - save_cache:
-          key: v2351-downs-{{ .Branch }}
+          key: v2352-downs-{{ .Branch }}
           paths:
             - C:/vcpkg-downs
       - save_cache:
-          key: v2351-bins-{{ .Branch }}
+          key: v2352-bins-{{ .Branch }}
           paths:
             - C:/vcpkg-bins
       - store_artifacts:

diff --git a/.circleci/port-setup.txt b/.circleci/port-setup.txt
@@ -1,21 +1,6 @@
-angle:x64-windows
-glslang[tools]:x64-windows
-spirv-cross:x64-windows
-spirv-tools:x64-windows
-spirv-headers:x64-windows
-assimp:x64-windows
-tinyexr:x64-windows
-gtest:x64-windows
-benchmark:x64-windows
-zstd:x64-windows
-draco:x64-windows
-civetweb:x64-windows
-cgltf:x64-windows
 protobuf:x64-windows
 grpc[codegen]:x64-windows
 flatbuffers:x64-windows
-opencl:x64-windows
-egl-registry:x64-windows
-opengl-registry:x64-windows
-vulkan-headers:x64-windows
-nlohmann-json:x64-windows
+abseil:x64-windows
+gtest:x64-windows
+benchmark:x64-windows
diff --git a/.circleci/port-uwp.txt b/.circleci/port-uwp.txt
diff --git a/.circleci/port-windows.txt b/.circleci/port-windows.txt
@@ -1,2 +1 @@
-grpc[codegen]:x64-windows
-onnxruntime[directml,xnnpack,test]:x64-windows
+onnxruntime[directml,xnnpack]:x64-windows
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -6,7 +6,7 @@ env:
   VCPKG_FEATURE_FLAGS: "registries,binarycaching,manifests,versions"
 
 jobs:
-  manifest:
+  overlay:
     runs-on: "macos-12"
     strategy:
       matrix:
@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/[email protected]
         with:
-          key: "v2351-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
+          key: "v2352-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
           path: |
             /usr/local/share/vcpkg-downloads
             /usr/local/share/vcpkg-archives

diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -6,7 +6,7 @@ env:
   VCPKG_FEATURE_FLAGS: "registries,binarycaching,manifests,versions"
 
 jobs:
-  manifest:
+  overlay:
     # check https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md
     runs-on: "ubuntu-22.04"
     strategy:
@@ -36,7 +36,7 @@ jobs:
 
       - uses: actions/[email protected]
         with:
-          key: "v2351-x64-linux-${{ matrix.vcpkg_tag }}"
+          key: "v2352-x64-linux-${{ matrix.vcpkg_tag }}"
           path: |
             ${{ runner.temp }}/vcpkg-downloads
             ${{ runner.temp }}/vcpkg-archives

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -6,7 +6,7 @@ env:
   VCPKG_FEATURE_FLAGS: "registries,binarycaching,manifests,versions"
 
 jobs:
-  manifest:
+  overlay:
     runs-on: "windows-2022"
     strategy:
       matrix:
@@ -36,7 +36,7 @@ jobs:
 
       - uses: actions/[email protected]
         with:
-          key: "v2351-x64-windows-${{ matrix.vcpkg_tag }}"
+          key: "v2352-x64-windows-${{ matrix.vcpkg_tag }}"
           path: |
             C:/vcpkg/downloads
             C:/vcpkg/archives
@@ -76,7 +76,7 @@ jobs:
       - uses: lukka/[email protected]
         with:
           vcpkgDirectory: "C:/vcpkg"
-          vcpkgGitCommitId: "a42af01b72c28a8e1d7b48107b33e4f286a55ef6" # 2023.11.20
+          vcpkgGitCommitId: "c8696863d371ab7f46e213d8f5ca923c4aef2a00" # 2023.12.12
           vcpkgJsonGlob: "test/vcpkg.json"
           runVcpkgInstall: true
           runVcpkgFormatString: '[`install`, `--clean-buildtrees-after-build`, `--clean-packages-after-build`, `--triplet`, `$[env.VCPKG_DEFAULT_TRIPLET]`]'

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ user@host:~/vcpkg$ tree -L 2 ./registry/
 └── triplets
     ├── arm64-android.cmake
     ├── x64-android.cmake
-    ├── arm-android.cmake
+    ├── x64-linux.cmake
     ├── arm64-ios-simulator.cmake
     └── x64-ios-simulator.cmake
 ```
@@ -77,7 +77,7 @@ The `ports/` folder contains `openssl3` and `tensorflow-lite`. Put them in the "
     "default-registry": {
         "kind": "git",
         "repository": "https://github.com/Microsoft/vcpkg",
-        "baseline": "6f7ffeb18f99796233b958aaaf14ec7bd4fb64b2"
+        "baseline": "0000..."
     },
     "registries": [
         {

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -24,7 +24,7 @@ schedules:
 
 variables:
   - name: vcpkg.commit
-    value: "a42af01b72c28a8e1d7b48107b33e4f286a55ef6" # 2023.11.20
+    value: "c8696863d371ab7f46e213d8f5ca923c4aef2a00" # 2023.12.12
   - name: vcpkg.overlay.ports # == VCPKG_OVERLAY_PORTS
     value: $(Build.SourcesDirectory)/ports # --overlay-ports $(Build.SourcesDirectory)/ports
   - name: vcpkg.disable.metrics
@@ -75,9 +75,9 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2351-bin-mac-host"'
+              key: '"v2352-bin-mac-host"'
               restoreKeys: |
-                "v2351-bin-mac-host"
+                "v2352-bin-mac-host"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             displayName: "coreml-tools"
@@ -117,15 +117,16 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2351-down-uwp"'
+              key: '"v2352-down-uwp"'
               restoreKeys: |
+                "v2352-down-uwp"
                 "v2351-down-uwp"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"v2351-bin-uwp" | "$(vcpkg.default.triplet)"'
+              key: '"v2352-bin-uwp" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
-                "v2351-bin-uwp" | "$(vcpkg.default.triplet)"
+                "v2352-bin-uwp" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             inputs:
@@ -173,15 +174,16 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2351-down-ubuntu"'
+              key: '"v2352-down-ubuntu"'
               restoreKeys: |
+                "v2352-down-ubuntu"
                 "v2351-down-ubuntu"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"v2351-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"'
+              key: '"v2352-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"'
               restoreKeys: |
-                "v2351-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"
+                "v2352-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             inputs:
@@ -220,15 +222,16 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2351-down-android"'
+              key: '"v2352-down-android"'
               restoreKeys: |
+                "v2352-down-android"
                 "v2351-down-android"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"v2351-bin-android" | "$(vcpkg.default.triplet)"'
+              key: '"v2352-bin-android" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
-                "v2351-bin-android" | "$(vcpkg.default.triplet)"
+                "v2352-bin-android" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             inputs:
@@ -277,15 +280,16 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2351-down-apple"'
+              key: '"v2352-down-apple"'
               restoreKeys: |
+                "v2352-down-apple"
                 "v2351-down-apple"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"v2351-bin-osx" | "$(vcpkg.default.triplet)"'
+              key: '"v2352-bin-osx" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
-                "v2351-bin-osx" | "$(vcpkg.default.triplet)"
+                "v2352-bin-osx" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             inputs:
@@ -322,15 +326,16 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2351-down-apple"'
+              key: '"v2352-down-apple"'
               restoreKeys: |
+                "v2352-down-apple"
                 "v2351-down-apple"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"v2351-bin-ios" | "$(vcpkg.default.triplet)"'
+              key: '"v2352-bin-ios" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
-                "v2351-bin-ios" | "$(vcpkg.default.triplet)"
+                "v2352-bin-ios" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             displayName: "arm64-ios"