Skip to content

bump dependencies #837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jun 25, 2025
Merged
23 changes: 21 additions & 2 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,40 @@ runs:
- uses: lukka/[email protected]

- 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
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ on:
permissions:
contents: read

concurrency:
group: ci-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
name: ${{ matrix.spec.name }}
Expand All @@ -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
Expand Down
7 changes: 5 additions & 2 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"name": "ziti",
"version-semver": "1.0.0",
"description": [
"using vcpkg baseline: 2025.06.13"
],
"builtin-baseline": "ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0",
"dependencies": [
"libuv",
{
Expand Down Expand Up @@ -41,6 +45,5 @@
}
]
}
},
"builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f"
}
}
Loading