From 778c8f1bdc6349bc871896bbd3636403fcbfcffb Mon Sep 17 00:00:00 2001 From: silverqx Date: Fri, 3 Dec 2021 13:08:07 +0100 Subject: [PATCH] setup vcpkg env. for all workflows --- .github/workflows/linux.yml | 6 +++--- .github/workflows/mingw.yml | 8 ++++++++ .github/workflows/msvc.yml | 16 +++++++++++++--- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 209555479..3970c7feb 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -163,13 +163,13 @@ jobs: compression = false max_size = 3G - # Doesn't work in the manifest mode, I'm using header library only (range-v3) so does not matter - # for now, I leave it here anyway. - - name: vcpkg set default triplet to x64-linux-dynamic + - name: vcpkg set-up environment run: | + echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV echo 'VCPKG_OVERLAY_TRIPLETS=${{ github.workspace }}/.github/resources/vcpkg-custom-triplets' \ >> $GITHUB_ENV echo 'VCPKG_DEFAULT_TRIPLET=x64-linux-dynamic' >> $GITHUB_ENV + echo 'VCPKG_MAX_CONCURRENCY=2' >> $GITHUB_ENV - name: TinyORM cmake configure (${{ matrix.compiler.key }}-cmake-debug) run: >- diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 9b9904661..a472e3daa 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -178,6 +178,14 @@ jobs: compression = false max_size = 3G + - name: vcpkg set-up environment + shell: msys2 {0} + run: | + echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV + echo 'VCPKG_DEFAULT_TRIPLET=x64-mingw-dynamic' >> $GITHUB_ENV + echo 'VCPKG_DEFAULT_HOST_TRIPLET=x64-mingw-dynamic' >> $GITHUB_ENV + echo 'VCPKG_MAX_CONCURRENCY=2' >> $GITHUB_ENV + - name: TinyORM cmake configure (${{ matrix.compiler.key }}-cmake-debug) shell: msys2 {0} run: >- diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 4c27c73f2..e92137bdc 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -169,9 +169,13 @@ jobs: env: DOWNLOAD_QMYSQL_DLLS: ${{ secrets.DOWNLOAD_QMYSQL_DLLS }} - - name: vcpkg set default triplet to x64-windows - run: >- - Write-Output 'VCPKG_DEFAULT_TRIPLET=x64-windows' | + - name: vcpkg set-up environment + run: | + Write-Output "VCPKG_ROOT=${env:VCPKG_INSTALLATION_ROOT}" | ` + Out-File -FilePath $env:GITHUB_ENV -Append + Write-Output 'VCPKG_DEFAULT_TRIPLET=x64-windows' | ` + Out-File -FilePath $env:GITHUB_ENV -Append + Write-Output 'VCPKG_MAX_CONCURRENCY=2' | ` Out-File -FilePath $env:GITHUB_ENV -Append - name: Visual Studio 2019 pwsh shell setup @@ -181,6 +185,12 @@ jobs: - name: TinyORM cmake configure (msvc-cmake-debug) run: >- + echo $env:VCPKG_ROOT + + echo $env:VCPKG_DEFAULT_TRIPLET + + echo $env:VCPKG_MAX_CONCURRENCY + cmake -S . -B ../TinyORM-builds-cmake/build-msvc-cmake-debug