From bf504c341792292ffade7c8db231166c1db93e00 Mon Sep 17 00:00:00 2001 From: luncliff Date: Thu, 6 Apr 2023 13:31:35 +0900 Subject: [PATCH] ci,docs: recommended vcpkg version 2022.11.14 * ci: change cache keys --- .circleci/config.yml | 18 +++++++-------- README.md | 7 +++++- azure-pipelines.yml | 54 ++++++++++++++++++++++---------------------- 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 475916cc..2bdc5ec7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,10 +52,10 @@ jobs: New-Item -Type Directory -Force -Path $env:VCPKG_DEFAULT_BINARY_CACHE - restore_cache: keys: - - 2310-downs-{{ checksum ".circleci/config.yml" }} + - 2313-downs-{{ checksum ".circleci/config.yml" }} - restore_cache: keys: - - 2310-bins-{{ .Branch }} + - 2313-bins-{{ .Branch }} windows_2022_x64: executor: @@ -90,10 +90,10 @@ jobs: Pop-Location - restore_cache: keys: - - 2310-downs-{{ checksum ".circleci/config.yml" }} + - 2313-downs-{{ checksum ".circleci/config.yml" }} - restore_cache: keys: - - 2310-bins-{{ checksum ".circleci/config.yml" }} + - 2313-bins-{{ checksum ".circleci/config.yml" }} - run: name: "Port: vcpkg-cmake" command: | @@ -112,16 +112,16 @@ jobs: equal: [ main, << pipeline.git.branch >> ] steps: - save_cache: - key: 2310-bins-{{ .Branch }} + key: 2313-bins-{{ .Branch }} paths: - C:/vcpkg-bins - save_cache: - key: 2310-downs-{{ checksum ".circleci/config.yml" }} + key: 2313-downs-{{ checksum ".circleci/config.yml" }} paths: - C:/vcpkg-downs when: always - save_cache: - key: 2310-bins-{{ checksum ".circleci/config.yml" }} + key: 2313-bins-{{ checksum ".circleci/config.yml" }} paths: - C:/vcpkg-bins when: always @@ -162,10 +162,10 @@ jobs: Pop-Location - restore_cache: keys: - - 2310-downs-{{ checksum ".circleci/config.yml" }} + - 2313-downs-{{ checksum ".circleci/config.yml" }} - restore_cache: keys: - - 2310-bins-{{ checksum ".circleci/config.yml" }} + - 2313-bins-{{ checksum ".circleci/config.yml" }} - run: name: "Port: vcpkg-cmake" command: | diff --git a/README.md b/README.md index f0cea9fe..608fe58c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Targets... -* [vcpkg](https://github.com/microsoft/vcpkg): [2022.10.19](https://github.com/microsoft/vcpkg/tree/2022.10.19) or later +* [vcpkg](https://github.com/microsoft/vcpkg): recommend [2022.11.14](https://github.com/microsoft/vcpkg/releases/tag/2022.11.14) or later * [vcpkg-tool](https://github.com/microsoft/vcpkg-tool) follows the vcpkg ### References @@ -72,6 +72,11 @@ The `ports/` folder contains `openssl3` and `tensorflow-lite`. Put them in the " ```json { + "default-registry": { + "kind": "git", + "repository": "https://github.com/Microsoft/vcpkg", + "baseline": "6f7ffeb18f99796233b958aaaf14ec7bd4fb64b2" + }, "registries": [ { "kind": "git", diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 153f6af0..05d12db1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -99,9 +99,9 @@ stages: - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE" - task: Cache@2 inputs: - key: '"2310-bin-mac-host"' + key: '"2313-bin-mac-host"' restoreKeys: | - "2310-bin-mac-host" + "2313-bin-mac-host" path: $(vcpkg.default.binary.cache) - task: run-vcpkg@0 displayName: "coreml-tools" @@ -148,15 +148,15 @@ stages: vcpkgGitCommitId: $(vcpkg.commit) - task: Cache@2 inputs: - key: '"2310-down-windows"' + key: '"2313-down-windows"' restoreKeys: | - "2310-down-windows" + "2313-down-windows" path: $(Build.BinariesDirectory)/vcpkg/downloads - task: Cache@2 inputs: - key: '"2310-bin-windows" | "$(vcpkg.default.triplet)"' + key: '"2313-bin-windows" | "$(vcpkg.default.triplet)"' restoreKeys: | - "2310-bin-windows" | "$(vcpkg.default.triplet)" + "2313-bin-windows" | "$(vcpkg.default.triplet)" path: $(vcpkg.default.binary.cache) - task: run-vcpkg@0 inputs: # usisng features requires over 10 GB space ... @@ -215,15 +215,15 @@ stages: vcpkgGitCommitId: $(vcpkg.commit) - task: Cache@2 inputs: - key: '"2310-down-uwp"' + key: '"2313-down-uwp"' restoreKeys: | - "2310-down-uwp" + "2313-down-uwp" path: $(Build.BinariesDirectory)/vcpkg/downloads - task: Cache@2 inputs: - key: '"2310-bin-uwp" | "$(vcpkg.default.triplet)"' + key: '"2313-bin-uwp" | "$(vcpkg.default.triplet)"' restoreKeys: | - "2310-bin-uwp" | "$(vcpkg.default.triplet)" + "2313-bin-uwp" | "$(vcpkg.default.triplet)" path: $(vcpkg.default.binary.cache) - task: run-vcpkg@0 inputs: @@ -282,15 +282,15 @@ stages: vcpkgGitCommitId: $(vcpkg.commit) - task: Cache@2 inputs: - key: '"2310-down-ubuntu"' + key: '"2313-down-ubuntu"' restoreKeys: | - "2310-down-ubuntu" + "2313-down-ubuntu" path: $(Build.BinariesDirectory)/vcpkg/downloads - task: Cache@2 inputs: - key: '"2310-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"' + key: '"2313-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"' restoreKeys: | - "2310-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)" + "2313-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)" path: $(vcpkg.default.binary.cache) - task: run-vcpkg@0 displayName: "x64-linux(failure)" @@ -350,16 +350,16 @@ stages: vcpkgGitCommitId: $(vcpkg.commit) - task: Cache@2 inputs: - key: '"2310-down-android"' + key: '"2313-down-android"' restoreKeys: | - "2310-down-android" + "2313-down-android" path: $(Build.BinariesDirectory)/vcpkg/downloads - task: Cache@2 inputs: - key: '"2310-bin-android" | "$(vcpkg.default.triplet)"' + key: '"2313-bin-android" | "$(vcpkg.default.triplet)"' restoreKeys: | - "2310-bin-android" | "$(vcpkg.default.triplet)" - "2310-bin-android" | "$(vcpkg.default.triplet)" + "2313-bin-android" | "$(vcpkg.default.triplet)" + "2313-bin-android" | "$(vcpkg.default.triplet)" path: $(vcpkg.default.binary.cache) - task: run-vcpkg@0 displayName: "Custom Triplet" @@ -419,15 +419,15 @@ stages: vcpkgGitCommitId: $(vcpkg.commit) - task: Cache@2 inputs: - key: '"2310-down-apple"' + key: '"2313-down-apple"' restoreKeys: | - "2310-down-apple" + "2313-down-apple" path: $(Build.BinariesDirectory)/vcpkg/downloads - task: Cache@2 inputs: - key: '"2310-bin-osx" | "$(vcpkg.default.triplet)"' + key: '"2313-bin-osx" | "$(vcpkg.default.triplet)"' restoreKeys: | - "2310-bin-osx" | "$(vcpkg.default.triplet)" + "2313-bin-osx" | "$(vcpkg.default.triplet)" path: $(vcpkg.default.binary.cache) - task: run-vcpkg@0 inputs: @@ -479,15 +479,15 @@ stages: vcpkgGitCommitId: $(vcpkg.commit) - task: Cache@2 inputs: - key: '"2310-down-apple"' + key: '"2313-down-apple"' restoreKeys: | - "2310-down-apple" + "2313-down-apple" path: $(Build.BinariesDirectory)/vcpkg/downloads - task: Cache@2 inputs: - key: '"2310-bin-ios" | "$(vcpkg.default.triplet)"' + key: '"2313-bin-ios" | "$(vcpkg.default.triplet)"' restoreKeys: | - "2310-bin-ios" | "$(vcpkg.default.triplet)" + "2313-bin-ios" | "$(vcpkg.default.triplet)" path: $(vcpkg.default.binary.cache) - task: run-vcpkg@0 displayName: "arm64-ios"