diff --git a/.github/workflows/hosted-advanced-dump-logs.yml b/.github/workflows/hosted-advanced-dump-logs.yml index 8913d8e..c341e32 100644 --- a/.github/workflows/hosted-advanced-dump-logs.yml +++ b/.github/workflows/hosted-advanced-dump-logs.yml @@ -35,7 +35,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@fixes with: vcpkgArguments: '${{ matrix.vcpkgPackages }}' vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' @@ -77,7 +77,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Restore artifacts, or Run vcpkg, build and cache artifacts - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@fixes id: runvcpkg with: vcpkgArguments: '${{ matrix.vcpkgPackages }}' diff --git a/.github/workflows/hosted-advanced-overlay.yml b/.github/workflows/hosted-advanced-overlay.yml index 860152b..5306a0e 100644 --- a/.github/workflows/hosted-advanced-overlay.yml +++ b/.github/workflows/hosted-advanced-overlay.yml @@ -43,7 +43,7 @@ jobs: VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }} filter: ^VCPKG.* - name: Restore artifacts, run vcpkg using overlays - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@fixes id: runvcpkg with: vcpkgArguments: '@${{ env.VCPKGRESPONSEFILE }} @${{ env.VCPKGRESPONSEFILE_FOR_OVERLAYS }}' diff --git a/.github/workflows/hosted-advanced-setup-vcpkg-manifest.yml b/.github/workflows/hosted-advanced-setup-vcpkg-manifest.yml index 315ec41..9b7c4d6 100644 --- a/.github/workflows/hosted-advanced-setup-vcpkg-manifest.yml +++ b/.github/workflows/hosted-advanced-setup-vcpkg-manifest.yml @@ -39,7 +39,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Restore artifacts, or setup vcpkg (do not install any package) - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@fixes id: runvcpkg with: setupOnly: true diff --git a/.github/workflows/hosted-advanced-setup-vcpkg-win_c_drive.yml b/.github/workflows/hosted-advanced-setup-vcpkg-win_c_drive.yml index b6eed70..c0f29fd 100644 --- a/.github/workflows/hosted-advanced-setup-vcpkg-win_c_drive.yml +++ b/.github/workflows/hosted-advanced-setup-vcpkg-win_c_drive.yml @@ -39,7 +39,7 @@ jobs: VCPKG_DEST_WIN: C:\qbt_tools\vcpkg filter: ^VCPKG.* - name: Restore artifacts, or setup vcpkg (do not install any package) - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@fixes id: runvcpkg with: setupOnly: true diff --git a/.github/workflows/hosted-advanced-setup-vcpkg.yml b/.github/workflows/hosted-advanced-setup-vcpkg.yml index b6811f7..cd1e36f 100644 --- a/.github/workflows/hosted-advanced-setup-vcpkg.yml +++ b/.github/workflows/hosted-advanced-setup-vcpkg.yml @@ -48,7 +48,7 @@ jobs: VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }} filter: ^VCPKG.* - name: Restore artifacts, or setup vcpkg (do not install any package) - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@fixes id: runvcpkg with: setupOnly: true diff --git a/.github/workflows/hosted-advanced-setup-vcpkg_submod-manifest.yml b/.github/workflows/hosted-advanced-setup-vcpkg_submod-manifest.yml index c193193..5ece717 100644 --- a/.github/workflows/hosted-advanced-setup-vcpkg_submod-manifest.yml +++ b/.github/workflows/hosted-advanced-setup-vcpkg_submod-manifest.yml @@ -35,7 +35,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Restore artifacts, or setup vcpkg (do not install any package) - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@fixes id: runvcpkg with: setupOnly: true diff --git a/.github/workflows/hosted-advanced.yml b/.github/workflows/hosted-advanced.yml index d124a29..886c9da 100644 --- a/.github/workflows/hosted-advanced.yml +++ b/.github/workflows/hosted-advanced.yml @@ -39,7 +39,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Restore artifacts, or Run vcpkg, build and cache artifacts - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@fixes id: runvcpkg with: vcpkgArguments: '${{ matrix.vcpkgPackages }}' diff --git a/.github/workflows/hosted-basic-cache-submod_vcpkg.yml b/.github/workflows/hosted-basic-cache-submod_vcpkg.yml index 9355274..92d11df 100644 --- a/.github/workflows/hosted-basic-cache-submod_vcpkg.yml +++ b/.github/workflows/hosted-basic-cache-submod_vcpkg.yml @@ -35,7 +35,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Restore artifacts, or run vcpkg, build and cache artifacts - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@fixes id: runvcpkg with: vcpkgArguments: '@${{ env.VCPKGRESPONSEFILE }}' diff --git a/.github/workflows/hosted-basic.yml b/.github/workflows/hosted-basic.yml index e9fb253..40bec5c 100644 --- a/.github/workflows/hosted-basic.yml +++ b/.github/workflows/hosted-basic.yml @@ -36,7 +36,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Restore artifacts, or run vcpkg, build and cache artifacts - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@fixes id: runvcpkg with: vcpkgArguments: '${{ matrix.vcpkgPackages }}' diff --git a/.github/workflows/hosted-cmakesettingsjson-cache-submod_vcpkg.yml b/.github/workflows/hosted-cmakesettingsjson-cache-submod_vcpkg.yml index 6b1465a..2a24130 100644 --- a/.github/workflows/hosted-cmakesettingsjson-cache-submod_vcpkg.yml +++ b/.github/workflows/hosted-cmakesettingsjson-cache-submod_vcpkg.yml @@ -38,7 +38,7 @@ jobs: run: find $RUNNER_WORKSPACE shell: bash - name: Restore artifacts, run vcpkg, build and cache artifacts - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@fixes id: runvcpkg with: vcpkgArguments: '@${{ env.VCPKGRESPONSEFILE }}' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b04a016..dc1fcf4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,7 +55,7 @@ jobs: run: gci -recurse ${{ runner.workspace }} if: contains( runner.os, 'windows') - name: Run vcpkg and cache artifacts - uses: lukka/run-vcpkg@main + uses: lukka/run-vcpkg@fixes id: runvcpkg with: vcpkgArguments: '@${{ github.workspace }}/cmakesettingsjson/vcpkg_x64.txt --triplet ${{ matrix.triplet }}' diff --git a/.gitignore b/.gitignore index e8f3893..25160e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ .vscode/ build +builds +.DS_Store +vcpkg_installed diff --git a/vcpkg b/vcpkg index a14a6bc..1c20782 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit a14a6bcb27287e3ec138dba1b948a0cdbc337a3a +Subproject commit 1c20782ea44a8c07be931a8b8286044ec175cddc