diff --git a/.github/workflows/VcpkgPackage.yml b/.github/workflows/VcpkgPackage.yml index 4df95552..d169e500 100644 --- a/.github/workflows/VcpkgPackage.yml +++ b/.github/workflows/VcpkgPackage.yml @@ -80,10 +80,6 @@ jobs: - name: run test shell: bash run: | - echo "Replacing annoying windows backslashes with forward slashes in VCPKG_ROOT" - echo "before VCPKG_ROOT=$VCPKG_ROOT" - VCPKG_ROOT=$(python -c "print('${{ github.workspace }}/vcpkg'.replace('\\\\', '/'))") - echo "after VCPKG_ROOT=$VCPKG_ROOT" - export VCPKG_ROOT + export VCPKG_ROOT=$(pwd)/vcpkg cd .github/ci_vcpkg_package_tests python run_ci_vcpkg_package_tests.py diff --git a/.github/workflows/VcpkgDeps.yml b/.github/workflows/t/VcpkgDeps.yml similarity index 83% rename from .github/workflows/VcpkgDeps.yml rename to .github/workflows/t/VcpkgDeps.yml index 88ada8e0..d3ea4ac5 100644 --- a/.github/workflows/VcpkgDeps.yml +++ b/.github/workflows/t/VcpkgDeps.yml @@ -53,11 +53,7 @@ jobs: # This will read the dependencies from the vcpkg.json file, # and the CMake preset from CMakePresets.json run: | - echo "Replacing annoying windows backslashes with forward slashes in VCPKG_ROOT" - echo "before VCPKG_ROOT=$VCPKG_ROOT" - VCPKG_ROOT=$(python -c "print('${{ github.workspace }}/vcpkg'.replace('\\\\', '/'))") - echo "after VCPKG_ROOT=$VCPKG_ROOT" - export VCPKG_ROOT + export VCPKG_ROOT=$(pwd)/vcpkg mkdir build cd build cmake .. --preset build_vcpkg_default -DCMAKE_BUILD_TYPE=Release