Skip to content

Commit 38ed555

Browse files
committed
vcpkg: update
1 parent e5779c2 commit 38ed555

File tree

2 files changed

+43
-3
lines changed

2 files changed

+43
-3
lines changed

.github/workflows/ci.yml

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ jobs:
304304
filename: '.\nuget\*.nupkg'
305305
api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}
306306
if: startsWith(github.ref, 'refs/tags/')
307-
##### vcpkg #####
308-
vcpkg:
307+
##### vcpkg-linux #####
308+
vcpkg-linux:
309309
strategy:
310310
fail-fast: false
311311
matrix:
@@ -358,6 +358,46 @@ jobs:
358358
run: |
359359
myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir build/vcpkg/overlay/${PACKAGE_NAME}
360360
if: startsWith(github.ref, 'refs/tags/')
361+
##### vcpkg-windows #####
362+
vcpkg-windows:
363+
runs-on: windows-latest
364+
defaults:
365+
run:
366+
shell: powershell
367+
name: vcpkg - windows
368+
steps:
369+
- name: git clone
370+
uses: actions/checkout@v4
371+
- name: get myci scripts
372+
uses: actions/checkout@v4
373+
with:
374+
repository: cppfw/myci
375+
ref: latest
376+
path: myci
377+
- name: add myci to PATH
378+
uses: myci-actions/export-env-var-powershell@main
379+
with: {name: PATH, value: "$env:Path;myci/src/powershell"}
380+
- name: set VCPKG_ROOT
381+
uses: myci-actions/export-env-var-powershell@main
382+
# accorging to github actions windows image docs, it should define VCPKG_INSTALLATION_ROOT env var,
383+
# but on practice it is not set, so specify vcpkg root path explicitly
384+
with: {name: VCPKG_ROOT, value: "C:/vcpkg/"}
385+
- name: prepare vcpkg port
386+
run: myci-vcpkg-prepare.ps1 -gitref ${{ github.sha }}
387+
- name: test vcpkg port
388+
run: |
389+
cd build/vcpkg/test
390+
cmake .
391+
cmake --build . --parallel
392+
./Debug/test.exe
393+
- name: upload vcpkg logs to artifacts
394+
if: always() # even if previous steps fail, this one needs to be run
395+
uses: actions/upload-artifact@v4
396+
with:
397+
name: vcpkg_windows_logs
398+
path: |
399+
vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
400+
build/vcpkg/**/*.log
361401
##### conan - linux #####
362402
conan-linux:
363403
strategy:

build/vcpkg/test/vcpkg-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{
99
"kind": "git",
1010
"repository": "https://github.com/cppfw/vcpkg-repo/",
11-
"baseline": "ee37b99a01227fddb2e59efa05335f0de2111cdc",
11+
"baseline": "d666088012d31420fbc56ff3923810d6834b62b3",
1212
"reference": "main",
1313
"packages": [ "myci" ]
1414
}

0 commit comments

Comments
 (0)