From e061e91f199a1c4d13c3bd29277f732265c5159c Mon Sep 17 00:00:00 2001 From: silverqx Date: Fri, 14 Jun 2024 16:35:47 +0200 Subject: [PATCH] workflows vcpkg added -vcpkg- to build folder name --- .github/workflows/vcpkg-linux-drivers.yml | 2 +- .github/workflows/vcpkg-linux.yml | 2 +- .github/workflows/vcpkg-windows-drivers.yml | 2 +- .github/workflows/vcpkg-windows.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/vcpkg-linux-drivers.yml b/.github/workflows/vcpkg-linux-drivers.yml index f51b1742c..f156d9ec7 100644 --- a/.github/workflows/vcpkg-linux-drivers.yml +++ b/.github/workflows/vcpkg-linux-drivers.yml @@ -338,7 +338,7 @@ jobs: helloWorldManualBuildName='manual-gcc-${{ matrix.build-type.key }}' echo "HelloWorldManualBuildName=$helloWorldManualBuildName" >> $GITHUB_ENV - tinyormManualBuildTree="$RUNNER_WORKSPACE/TinyORM-builds-cmake/build-TinyDrivers-$helloWorldManualBuildName" + tinyormManualBuildTree="$RUNNER_WORKSPACE/TinyORM-builds-cmake/build-TinyDrivers-vcpkg-$helloWorldManualBuildName" echo "TinyORMManualBuildTree=$tinyormManualBuildTree" >> $GITHUB_ENV helloWoldManualBuildTree="$RUNNER_WORKSPACE/HelloWorld-builds-cmake/build-TinyDrivers-$helloWorldManualBuildName" diff --git a/.github/workflows/vcpkg-linux.yml b/.github/workflows/vcpkg-linux.yml index b01e33463..a5d358d89 100644 --- a/.github/workflows/vcpkg-linux.yml +++ b/.github/workflows/vcpkg-linux.yml @@ -314,7 +314,7 @@ jobs: helloWorldManualBuildName='manual-gcc-${{ matrix.build-type.key }}' echo "HelloWorldManualBuildName=$helloWorldManualBuildName" >> $GITHUB_ENV - tinyormManualBuildTree="$RUNNER_WORKSPACE/TinyORM-builds-cmake/build-$helloWorldManualBuildName" + tinyormManualBuildTree="$RUNNER_WORKSPACE/TinyORM-builds-cmake/build-vcpkg-$helloWorldManualBuildName" echo "TinyORMManualBuildTree=$tinyormManualBuildTree" >> $GITHUB_ENV helloWoldManualBuildTree="$RUNNER_WORKSPACE/HelloWorld-builds-cmake/build-$helloWorldManualBuildName" diff --git a/.github/workflows/vcpkg-windows-drivers.yml b/.github/workflows/vcpkg-windows-drivers.yml index 56fad5e39..70d3b843f 100644 --- a/.github/workflows/vcpkg-windows-drivers.yml +++ b/.github/workflows/vcpkg-windows-drivers.yml @@ -345,7 +345,7 @@ jobs: "HelloWorldManualBuildName=$helloWorldManualBuildName" >> $env:GITHUB_ENV $tinyormManualBuildTree = Join-Path -Path $env:RUNNER_WORKSPACE ` - TinyORM-builds-cmake "Drivers-$helloWorldManualBuildName" + TinyORM-builds-cmake "Drivers-vcpkg-$helloWorldManualBuildName" "TinyORMManualBuildTree=$tinyormManualBuildTree" >> $env:GITHUB_ENV $helloWorldManualBuildTree = Join-Path -Path $env:RUNNER_WORKSPACE ` diff --git a/.github/workflows/vcpkg-windows.yml b/.github/workflows/vcpkg-windows.yml index 5ca4d8d8f..47ffe4e1a 100644 --- a/.github/workflows/vcpkg-windows.yml +++ b/.github/workflows/vcpkg-windows.yml @@ -326,7 +326,7 @@ jobs: "HelloWorldManualBuildName=$helloWorldManualBuildName" >> $env:GITHUB_ENV $tinyormManualBuildTree = Join-Path -Path $env:RUNNER_WORKSPACE ` - TinyORM-builds-cmake "build-$helloWorldManualBuildName" + TinyORM-builds-cmake "build-vcpkg-$helloWorldManualBuildName" "TinyORMManualBuildTree=$tinyormManualBuildTree" >> $env:GITHUB_ENV $helloWorldManualBuildTree = Join-Path -Path $env:RUNNER_WORKSPACE `