diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index c0068299..e08dd068 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -48,21 +48,40 @@ runs: - uses: lukka/get-cmake@v3.30.1 - uses: lukka/run-vcpkg@v11 + with: + vcpkgJsonGlob: './vcpkg.json' - - uses: actions/cache@v4 + - uses: actions/cache/restore@v4 + id: restore with: key: vbc-${{ inputs.target }}-${{ hashFiles('./vcpkg.json') }} + restore-keys: vbc-${{ inputs.target }}- path: ${{ env.CI_CACHE }} - name: Configure CMake + id: configure shell: bash run: | cmake --preset ci-${{ inputs.target }} -B ./build + ls -lR ${CI_CACHE} + + - name: upload config failures + if: failure() && steps.configure.outcome == 'failure' + uses: actions/upload-artifact@v4 + with: + name: ${{ inputs.target }}-config-logs + path: | + ./vcpkg/buildtrees/**/*.log + ./build/**/*.log + + - uses: actions/cache/save@v4 + with: + key: ${{ steps.restore.outputs.cache-primary-key }} + path: ${{ env.CI_CACHE }} - name: build CMake run: | cmake --build ./build --config ${{ inputs.config }} - ls -lR ${CI_CACHE} shell: bash - name: bundle artifacts diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index f52eac08..f972f85e 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -13,6 +13,10 @@ on: permissions: contents: read +concurrency: + group: ci-${{ github.ref }} + cancel-in-progress: true + jobs: build: name: ${{ matrix.spec.name }} @@ -31,7 +35,6 @@ jobs: - { name: 'MacOS x86_64', runner: 'macOS-13', target: 'macOS-x64', test: 'true' } - { name: 'MacOS arm64', runner: 'macOS-14', target: 'macOS-arm64', test: 'true' } - { name: 'Windows x86_64', runner: 'windows-2022', target: 'windows-x64', test: 'true' } - - { name: 'Windows x86', runner: 'windows-2022', target: 'windows-x86', test: 'true' } - { name: 'Windows ARM64', runner: 'windows-2022', target: 'windows-arm64' } steps: - name: Add msbuild to PATH diff --git a/vcpkg.json b/vcpkg.json index 21eff74a..b373d9ea 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,10 @@ { "name": "ziti", "version-semver": "1.0.0", + "description": [ + "using vcpkg baseline: 2025.06.13" + ], + "builtin-baseline": "ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0", "dependencies": [ "libuv", { @@ -41,6 +45,5 @@ } ] } - }, - "builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f" + } }