Skip to content

Commit

Permalink
test run-cmake and run-vcpkg at dev/node20-update-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
lukka committed Nov 1, 2023
1 parent 274211b commit a742d77
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/hosted-cmake-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hosted-contexts-dump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/hosted-dump-logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down Expand Up @@ -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'
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/hosted-matchers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/hosted-msbuild-vcpkg_submod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hosted-ninja-toolchain-vcpkg_submod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hosted-ninja-vcpkg-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hosted-ninja-vcpkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hosted-ninja-vcpkg_submod-autocache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hosted-ninja-vcpkg_submod-triplet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hosted-ninja-vcpkg_submod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion vcpkg
Submodule vcpkg updated 2325 files

0 comments on commit a742d77

Please sign in to comment.