From ea5670b984333d11e0d28a8d863e64890bf58611 Mon Sep 17 00:00:00 2001 From: luca <681992+lukka@users.noreply.github.com> Date: Sun, 30 Jan 2022 21:42:56 +0100 Subject: [PATCH] tests for PR https://github.com/lukka/run-vcpkg/pull/126 --- .github/workflows/hosted-contexts-dump.yml | 2 +- .github/workflows/hosted-dump-logs.yml | 4 ++-- .github/workflows/hosted-msbuild-vcpkg_submod.yml | 2 +- .github/workflows/hosted-ninja-toolchain-vcpkg_submod.yml | 2 +- .github/workflows/hosted-ninja-vcpkg-install.yml | 2 +- .github/workflows/hosted-ninja-vcpkg.yml | 2 +- .github/workflows/hosted-ninja-vcpkg_submod-triplet.yml | 2 +- .github/workflows/hosted-ninja-vcpkg_submod.yml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/hosted-contexts-dump.yml b/.github/workflows/hosted-contexts-dump.yml index e51853a..039a9a0 100644 --- a/.github/workflows/hosted-contexts-dump.yml +++ b/.github/workflows/hosted-contexts-dump.yml @@ -56,7 +56,7 @@ jobs: if: contains( runner.os, 'windows') - uses: lukka/get-cmake@latest - name: Setup vcpkg or restore from cache the artifacts - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@fixes id: runvcpkg with: vcpkgDirectory: ${{ github.workspace }}/../b/vcpkg diff --git a/.github/workflows/hosted-dump-logs.yml b/.github/workflows/hosted-dump-logs.yml index 21d0ca2..5acdec9 100644 --- a/.github/workflows/hosted-dump-logs.yml +++ b/.github/workflows/hosted-dump-logs.yml @@ -29,7 +29,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Run vcpkg and dump its failure log - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@fixes with: vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' vcpkgGitCommitId: '${{ matrix.vcpkgCommitId }}' @@ -63,7 +63,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Restore artifacts for vcpkg (or setup vcpkg if cache miss). - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@fixes id: runvcpkg with: vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' diff --git a/.github/workflows/hosted-msbuild-vcpkg_submod.yml b/.github/workflows/hosted-msbuild-vcpkg_submod.yml index 69759b3..43b28f3 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: Restore artifacts, or run vcpkg, build and cache artifacts - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@fixes id: runvcpkg with: vcpkgJsonGlob: '**/cmakepresets/vcpkg.json' diff --git a/.github/workflows/hosted-ninja-toolchain-vcpkg_submod.yml b/.github/workflows/hosted-ninja-toolchain-vcpkg_submod.yml index 3cea5cc..d5f97cf 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: Restore artifacts, or run vcpkg, build and cache artifacts - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@fixes id: runvcpkg with: vcpkgJsonGlob: '**/cmakepresets/vcpkg.json' diff --git a/.github/workflows/hosted-ninja-vcpkg-install.yml b/.github/workflows/hosted-ninja-vcpkg-install.yml index d4ea5c3..0baca94 100644 --- a/.github/workflows/hosted-ninja-vcpkg-install.yml +++ b/.github/workflows/hosted-ninja-vcpkg-install.yml @@ -47,7 +47,7 @@ jobs: shell: bash - name: Restore artifacts, or run vcpkg, build (and cache artifacts as post step) - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@fixes id: runvcpkg with: vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' diff --git a/.github/workflows/hosted-ninja-vcpkg.yml b/.github/workflows/hosted-ninja-vcpkg.yml index fd39fb0..40a78e9 100644 --- a/.github/workflows/hosted-ninja-vcpkg.yml +++ b/.github/workflows/hosted-ninja-vcpkg.yml @@ -42,7 +42,7 @@ jobs: shell: bash - name: Restore artifacts, or setup vcpkg (do not install any package) - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@fixes id: runvcpkg with: # This specifies the location of vcpkg, where it is going to be restored from cache, or create from scratch. diff --git a/.github/workflows/hosted-ninja-vcpkg_submod-triplet.yml b/.github/workflows/hosted-ninja-vcpkg_submod-triplet.yml index 72fce64..4b43e02 100644 --- a/.github/workflows/hosted-ninja-vcpkg_submod-triplet.yml +++ b/.github/workflows/hosted-ninja-vcpkg_submod-triplet.yml @@ -42,7 +42,7 @@ jobs: shell: bash - name: Restore artifacts, or setup vcpkg for building artifacts - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@fixes id: runvcpkg with: # This one is not needed, as it is the default value anyway. diff --git a/.github/workflows/hosted-ninja-vcpkg_submod.yml b/.github/workflows/hosted-ninja-vcpkg_submod.yml index a85f8cc..b3bcffc 100644 --- a/.github/workflows/hosted-ninja-vcpkg_submod.yml +++ b/.github/workflows/hosted-ninja-vcpkg_submod.yml @@ -32,7 +32,7 @@ jobs: shell: bash - name: Restore artifacts, or setup vcpkg for building artifacts - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@fixes id: runvcpkg with: # This one is not needed, as it is the default value anyway.