diff --git a/.github/workflows/hosted-cmake-workflow.yml b/.github/workflows/hosted-cmake-workflow.yml index 91e3ad2..65c10c6 100644 --- a/.github/workflows/hosted-cmake-workflow.yml +++ b/.github/workflows/hosted-cmake-workflow.yml @@ -26,7 +26,7 @@ jobs: shell: bash - name: Setup vcpkg for building artifacts - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@dev/node20-update-deps id: runvcpkg with: vcpkgJsonGlob: '**/cmakepresets/vcpkg.json' @@ -38,7 +38,7 @@ jobs: run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' " - name: Run CMake-Workflow+vcpkg+Ninja - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps id: runcmake with: cmakeListsTxtPath: '${{ github.workspace }}/cmakepresets/CMakeLists.txt' diff --git a/.github/workflows/hosted-contexts-dump.yml b/.github/workflows/hosted-contexts-dump.yml index b41c659..faea383 100644 --- a/.github/workflows/hosted-contexts-dump.yml +++ b/.github/workflows/hosted-contexts-dump.yml @@ -59,14 +59,14 @@ jobs: if: contains( runner.os, 'windows') - uses: lukka/get-cmake@latest - name: Setup vcpkg - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@dev/node20-update-deps id: runvcpkg with: vcpkgDirectory: ${{ github.workspace }}/../b/vcpkg vcpkgGitCommitId: ${{ env.vcpkgGitCommitId }} vcpkgJsonGlob: '**/cmakepresets/vcpkg.json' - name: Run CMake - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps id: runcmake with: cmakeListsTxtPath: '${{ github.workspace }}/cmakepresets/CMakeLists.txt' diff --git a/.github/workflows/hosted-dump-logs.yml b/.github/workflows/hosted-dump-logs.yml index 52f62fd..e600c20 100644 --- a/.github/workflows/hosted-dump-logs.yml +++ b/.github/workflows/hosted-dump-logs.yml @@ -30,7 +30,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Run vcpkg and dump its failure log - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@dev/node20-update-deps with: vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' vcpkgGitCommitId: '${{ matrix.vcpkgCommitId }}' @@ -67,7 +67,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Setup vpkg - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@dev/node20-update-deps id: runvcpkg with: vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' @@ -78,7 +78,7 @@ jobs: run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' " - name: Run CMake and dump its failure log continue-on-error: true - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps with: cmakeListsTxtPath: '${{ github.workspace }}/cmakepresets/CMakeLists.txt' configurePreset: ninja-multi-vcpkg diff --git a/.github/workflows/hosted-matchers.yml b/.github/workflows/hosted-matchers.yml index 78437c3..c096aaa 100644 --- a/.github/workflows/hosted-matchers.yml +++ b/.github/workflows/hosted-matchers.yml @@ -43,20 +43,20 @@ jobs: # https://github.com/actions/runner/issues/461 if: false continue-on-error: true - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps with: cmakeListsTxtPath: '${{ github.workspace }}/matchers/cmake_error/CMakeLists.txt' configurePreset: ninja - name: Run CMake+Ninja with triplet (cmd) [Build error] continue-on-error: true - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps with: cmakeListsTxtPath: '${{ github.workspace }}/matchers/build_error/CMakeLists.txt' configurePreset: ninja buildPreset: ninja - name: Run CMake+Ninja with triplet (cmd) [CMake error + warning] continue-on-error: true - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps with: cmakeListsTxtPath: '${{ github.workspace }}/cmakepresets/CMakeLists.txt' configurePreset: ninja-multi-vcpkg \ No newline at end of file diff --git a/.github/workflows/hosted-msbuild-vcpkg_submod.yml b/.github/workflows/hosted-msbuild-vcpkg_submod.yml index 9ab7464..2981bb4 100644 --- a/.github/workflows/hosted-msbuild-vcpkg_submod.yml +++ b/.github/workflows/hosted-msbuild-vcpkg_submod.yml @@ -26,7 +26,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Setup vcpkg - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@dev/node20-update-deps id: runvcpkg with: vcpkgJsonGlob: '**/cmakepresets/vcpkg.json' @@ -36,7 +36,7 @@ jobs: - name: Prints output of run-vcpkg's action. run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' " - name: Run CMake+MSBuild - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps if: contains( matrix.os, 'windows') with: cmakeListsTxtPath: '${{ github.workspace }}/cmakepresets/CMakeLists.txt' diff --git a/.github/workflows/hosted-ninja-toolchain-vcpkg_submod.yml b/.github/workflows/hosted-ninja-toolchain-vcpkg_submod.yml index e042eb4..69b34bb 100644 --- a/.github/workflows/hosted-ninja-toolchain-vcpkg_submod.yml +++ b/.github/workflows/hosted-ninja-toolchain-vcpkg_submod.yml @@ -27,7 +27,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Setup vcpkg - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@dev/node20-update-deps id: runvcpkg with: vcpkgJsonGlob: '**/cmakepresets/vcpkg.json' @@ -38,7 +38,7 @@ jobs: - name: Prints output of run-vcpkg's action. run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' " - name: Run CMake+vcpkg+Ninja - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps id: runcmake with: cmakeListsTxtPath: '${{ github.workspace }}/cmakepresets/CMakeLists.txt' diff --git a/.github/workflows/hosted-ninja-vcpkg-install.yml b/.github/workflows/hosted-ninja-vcpkg-install.yml index 1dbc2cd..68d49e8 100644 --- a/.github/workflows/hosted-ninja-vcpkg-install.yml +++ b/.github/workflows/hosted-ninja-vcpkg-install.yml @@ -52,7 +52,7 @@ jobs: shell: bash - name: Setup vcpkg - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@dev/node20-update-deps id: runvcpkg with: vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' @@ -65,7 +65,7 @@ jobs: run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' " - name: Run CMake with Ninja - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps with: cmakeListsTxtPath: '${{ github.workspace }}/cmakepresets/CMakeLists.txt' configurePreset: 'ninja-multi-vcpkg' diff --git a/.github/workflows/hosted-ninja-vcpkg.yml b/.github/workflows/hosted-ninja-vcpkg.yml index bb0bf0b..5f43ddc 100644 --- a/.github/workflows/hosted-ninja-vcpkg.yml +++ b/.github/workflows/hosted-ninja-vcpkg.yml @@ -45,7 +45,7 @@ jobs: shell: bash - name: Setup vcpkg - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@dev/node20-update-deps id: runvcpkg with: # This specifies the location of vcpkg, where it is going to be restored from cache, or create from scratch. @@ -59,7 +59,7 @@ jobs: run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}'" - name: Run CMake with vcpkg.json manifest - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps with: cmakeListsTxtPath: '${{ github.workspace }}/cmakepresets/CMakeLists.txt' configurePreset: ninja-multi-vcpkg diff --git a/.github/workflows/hosted-ninja-vcpkg_submod-autocache.yml b/.github/workflows/hosted-ninja-vcpkg_submod-autocache.yml index 79df50b..5cb97b5 100644 --- a/.github/workflows/hosted-ninja-vcpkg_submod-autocache.yml +++ b/.github/workflows/hosted-ninja-vcpkg_submod-autocache.yml @@ -39,7 +39,7 @@ jobs: shell: bash - name: Restore vcpkg executable and data files from GH Action cache, or setup vcpkg from scratch if there is a cache-miss - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@dev/node20-update-deps id: runvcpkg with: # This one is not needed, as it is the default value anyway. @@ -54,7 +54,7 @@ jobs: - name: Prints output of run-vcpkg's action. run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' " - name: Run CMake+vcpkg+Ninja - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps id: runcmake with: cmakeListsTxtPath: '${{ github.workspace }}/cmakepresets/CMakeLists.txt' diff --git a/.github/workflows/hosted-ninja-vcpkg_submod-triplet.yml b/.github/workflows/hosted-ninja-vcpkg_submod-triplet.yml index 4cbb59f..5d7c111 100644 --- a/.github/workflows/hosted-ninja-vcpkg_submod-triplet.yml +++ b/.github/workflows/hosted-ninja-vcpkg_submod-triplet.yml @@ -45,7 +45,7 @@ jobs: shell: bash - name: Setup vcpkg - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@dev/node20-update-deps id: runvcpkg with: # This one is not needed, as it is the default value anyway. @@ -58,7 +58,7 @@ jobs: - name: Prints output of run-vcpkg's action. run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' " - name: Run CMake+vcpkg+NinjaMulti-Config (Release configuration) - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps id: runcmake with: cmakeListsTxtPath: '${{ github.workspace }}/cmakepresets/CMakeLists.txt' diff --git a/.github/workflows/hosted-ninja-vcpkg_submod.yml b/.github/workflows/hosted-ninja-vcpkg_submod.yml index e7a89f9..d1ae763 100644 --- a/.github/workflows/hosted-ninja-vcpkg_submod.yml +++ b/.github/workflows/hosted-ninja-vcpkg_submod.yml @@ -39,7 +39,7 @@ jobs: shell: bash - name: Setup vcpkg - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@dev/node20-update-deps id: runvcpkg with: # This one is not needed, as it is the default value anyway. @@ -52,7 +52,7 @@ jobs: - name: Prints output of run-vcpkg's action. run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' " - name: Run CMake+vcpkg+Ninja - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@dev/node20-update-deps id: runcmake with: cmakeListsTxtPath: '${{ github.workspace }}/cmakepresets/CMakeLists.txt' diff --git a/vcpkg b/vcpkg index 69efe9c..3ef62a2 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 69efe9cc2df0015f0bb2d37d55acde4a75c9a25b +Subproject commit 3ef62a2a767cd5df9bffd0559549752ae07a49ec