Squashed commit of the following:

commit 2d6287c Author: luncliff <luncliff@gmail.com> Date: Sun Apr 21 00:21:18 2024 +0900 ci: update cache key to 2416 * use vcpkg 2024.03.25 commit 0151833 Author: luncliff <luncliff@gmail.com> Date: Sun Apr 21 00:17:55 2024 +0900 ci: use NDK r26d * actions/runner-images#9685 * https://github.com/android/ndk/releases/tag/r26d
luncliff · Apr 23, 2024 · ba9c093 · ba9c093
1 parent 5c480ea
commit ba9c093
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 33 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,21 +36,21 @@ jobs:
       - checkout
       - aws-cli/setup
       - run:
-          name: "Setup: microsoft/vcpkg(2024.02.14)"
+          name: "Setup: microsoft/vcpkg(2024.03.25)"
           shell: "powershell.exe"
           command: |
             New-Item -Type Directory -Force -Path $env:VCPKG_DOWNLOADS
             New-Item -Type Directory -Force -Path $env:VCPKG_DEFAULT_BINARY_CACHE
-            git clone --branch=2024.02.14 --depth=1 https://github.com/microsoft/vcpkg
+            git clone --branch=2024.03.25 --depth=1 https://github.com/microsoft/vcpkg
             Push-Location vcpkg
               ./bootstrap-vcpkg.bat
               ./vcpkg.exe --version
             Pop-Location
       - restore_cache:
           keys:
-            - v2407-windows-{{ checksum ".circleci/config.yml" }}
-            - v2407-windows-{{ .Branch }}
-            - v2407-windows-main
+            - v2416-windows-{{ checksum ".circleci/config.yml" }}
+            - v2416-windows-{{ .Branch }}
+            - v2416-windows-main
       - run:
           name: "Install: port-windows.txt"
           shell: "powershell.exe"
@@ -68,15 +68,15 @@ jobs:
             equal: [ main, << pipeline.git.branch >> ]
           steps:
            - save_cache:
-              key: v2407-windows-main
+              key: v2416-windows-main
               paths:
                 - C:/vcpkg-caches
       - save_cache:
-          key: v2407-windows-{{ .Branch }}
+          key: v2416-windows-{{ .Branch }}
           paths:
             - C:/vcpkg-caches
       - save_cache:
-          key: v2407-windows-{{ checksum ".circleci/config.yml" }}
+          key: v2416-windows-{{ checksum ".circleci/config.yml" }}
           paths:
             - C:/vcpkg-caches
       - store_artifacts:
@@ -97,23 +97,23 @@ jobs:
       - checkout
       - aws-cli/setup
       - run:
-          name: "Setup: microsoft/vcpkg(2024.02.14)"
+          name: "Setup: microsoft/vcpkg(2024.03.25)"
           command: |
             sudo apt-get update -y -q
             sudo apt-get install -y -q curl zip unzip tar
             mkdir -p $VCPKG_DOWNLOADS
             mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
-            git clone --branch=2024.02.14 --depth=1 https://github.com/microsoft/vcpkg
+            git clone --branch=2024.03.25 --depth=1 https://github.com/microsoft/vcpkg
             pushd vcpkg
               ./bootstrap-vcpkg.sh
               ./vcpkg --version
             popd
             pwd
       - restore_cache:
           keys:
-            - v2407-linux-{{ checksum ".circleci/config.yml" }}
-            - v2407-linux-{{ .Branch }}
-            - v2407-linux-main
+            - v2416-linux-{{ checksum ".circleci/config.yml" }}
+            - v2416-linux-{{ .Branch }}
+            - v2416-linux-main
       - run:
           name: "Install APT packages"
           command: |
@@ -134,11 +134,11 @@ jobs:
           working_directory: vcpkg
           no_output_timeout: 1h
       - save_cache:
-          key: v2407-linux-{{ .Branch }}
+          key: v2416-linux-{{ .Branch }}
           paths:
             - /tmp/vcpkg-caches
       - save_cache:
-          key: v2407-linux-{{ checksum ".circleci/config.yml" }}
+          key: v2416-linux-{{ checksum ".circleci/config.yml" }}
           paths:
             - /tmp/vcpkg-caches
       - store_artifacts:

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -38,7 +38,7 @@ jobs:
 
       - uses: actions/cache@v4.0.0
         with:
-          key: "v2407-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
+          key: "v2416-${{ 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
@@ -40,7 +40,7 @@ jobs:
 
       - uses: actions/cache@v4.0.0
         with:
-          key: "v2407-x64-linux-${{ matrix.vcpkg_tag }}"
+          key: "v2416-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
@@ -42,7 +42,7 @@ jobs:
 
       - uses: actions/cache@v4.0.0
         with:
-          key: "v2407-x64-windows-${{ matrix.vcpkg_tag }}"
+          key: "v2416-x64-windows-${{ matrix.vcpkg_tag }}"
           path: |
             C:/vcpkg/downloads
             C:/vcpkg/archives

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,7 +25,7 @@ schedules:
 variables:
   # check https://github.com/microsoft/vcpkg/releases
   - name: vcpkg.commit
-    value: "fba75d09065fcc76a25dcf386b1d00d33f5175af" # 2024.02.14
+    value: "a34c873a9717a888f58dc05268dea15592c2f0ff" # 2024.03.25
 
   - name: vcpkg.overlay.ports # == VCPKG_OVERLAY_PORTS
     value: $(Build.SourcesDirectory)/ports # --overlay-ports $(Build.SourcesDirectory)/ports
@@ -84,10 +84,10 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2406-bin-uwp" | "$(vcpkg.default.triplet)"'
+              key: '"v2416-bin-uwp" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
+                "v2416-bin-uwp" | "$(vcpkg.default.triplet)"
                 "v2406-bin-uwp" | "$(vcpkg.default.triplet)"
-                "v2404-bin-uwp" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: PowerShell@2
             displayName: "Test: arm64-windows"
@@ -146,10 +146,10 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2406-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"'
+              key: '"v2416-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"'
               restoreKeys: |
+                "v2416-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"
                 "v2406-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"
-                "v2404-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"
               path: $(vcpkg.default.binary.cache)
           - task: PowerShell@2
             displayName: "Test: $(cxx)"
@@ -184,18 +184,18 @@ stages:
           matrix: # https://github.com/android/ndk/releases
             arm64_ndk26:
               vcpkg.default.triplet: "arm64-android"
-              android.ndk.home: "/usr/local/lib/android/sdk/ndk/26.2.11394342"
+              android.ndk.home: "/usr/local/lib/android/sdk/ndk/26.3.11579264"
             x64_ndk26:
               vcpkg.default.triplet: "x64-android"
-              android.ndk.home: "/usr/local/lib/android/sdk/ndk/26.2.11394342"
+              android.ndk.home: "/usr/local/lib/android/sdk/ndk/26.3.11579264"
         steps:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2406-bin-android" | "$(vcpkg.default.triplet)"'
+              key: '"v2416-bin-android" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
+                "v2416-bin-android" | "$(vcpkg.default.triplet)"
                 "v2406-bin-android" | "$(vcpkg.default.triplet)"
-                "v2404-bin-android" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: PowerShell@2
             displayName: "Test: $(vcpkg.default.triplet)"
@@ -234,10 +234,10 @@ stages:
             displayName: "Install HomeBrew packages"
           - task: Cache@2
             inputs:
-              key: '"v2406-bin-mac-host"'
+              key: '"v2416-bin-mac-host"'
               restoreKeys: |
+                "v2416-bin-mac-host"
                 "v2406-bin-mac-host"
-                "v2404-bin-mac-host"
               path: $(vcpkg.default.binary.cache)
           - task: PowerShell@2
             displayName: "Test: osx(host)"
@@ -289,10 +289,10 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2406-bin-osx" | "$(vcpkg.default.triplet)"'
+              key: '"v2416-bin-osx" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
+                "v2416-bin-osx" | "$(vcpkg.default.triplet)"
                 "v2406-bin-osx" | "$(vcpkg.default.triplet)"
-                "v2404-bin-osx" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: PowerShell@2
             displayName: "Test: osx"
@@ -334,10 +334,10 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2406-bin-ios" | "$(vcpkg.default.triplet)"'
+              key: '"v2416-bin-ios" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
+                "v2416-bin-ios" | "$(vcpkg.default.triplet)"
                 "v2406-bin-ios" | "$(vcpkg.default.triplet)"
-                "v2404-bin-ios" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: PowerShell@2
             displayName: "Test: arm64-ios"