diff --git a/.github/workflows/ci-linux_mac.yml b/.github/workflows/ci-linux_mac.yml index de2a4c9f8f9..91e29c9bbb8 100644 --- a/.github/workflows/ci-linux_mac.yml +++ b/.github/workflows/ci-linux_mac.yml @@ -41,6 +41,7 @@ env: CXX: ${{ inputs.matrix_compiler_cxx }} CC: ${{ inputs.matrix_compiler_cc }} bootstrap_args: ${{ inputs.bootstrap_args }} + VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite' jobs: build: @@ -59,24 +60,20 @@ jobs: submodules: true fetch-depth: 0 - - name: Generate vcpkg cache key data - run: | - echo "${CC}" > $GITHUB_WORKSPACE/vcpkg-cache-key.data - echo "${CXX}" >> $GITHUB_WORKSPACE/vcpkg-cache-key.data - echo "${bootstrap_args}" >> $GITHUB_WORKSPACE/vcpkg-cache-key.data - shell: bash - - - name: Create vcpkg cache key - id: vcpkg_cache_key - run: echo "value=${{ hashFiles('vcpkg-cache-key.data') }}" >> $GITHUB_OUTPUT + # Configure required environment variables for vcpkg to use + # GitHub's Action Cache + - uses: actions/github-script@v6 + with: + script: | + core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - - name: Restore artifacts, or setup vcpkg for building artifacts - uses: lukka/run-vcpkg@v10 + - name: Setup vcpkg + uses: lukka/run-vcpkg@v11 id: runvcpkg with: vcpkgJsonGlob: 'vcpkg.json' vcpkgDirectory: '${{ github.workspace }}/external/vcpkg' - prependedCacheKey: 'tiledb-${{steps.vcpkg_cache_key.outputs.value}}' - name: Prints output of run-vcpkg's action. run: | diff --git a/external/vcpkg b/external/vcpkg index f14984af373..69efe9cc2df 160000 --- a/external/vcpkg +++ b/external/vcpkg @@ -1 +1 @@ -Subproject commit f14984af3738e69f197bf0e647a8dca12de92996 +Subproject commit 69efe9cc2df0015f0bb2d37d55acde4a75c9a25b