diff --git a/.github/workflows/prebuild-gh_envs.yml b/.github/workflows/prebuild-gh_envs.yml index 0c7bea4d676839..2934f8e5126148 100644 --- a/.github/workflows/prebuild-gh_envs.yml +++ b/.github/workflows/prebuild-gh_envs.yml @@ -110,20 +110,20 @@ jobs: run: | brew install bison flex pkg-config automake libtool autoconf autoconf-archive coreutils - - name: "Only run on windows" - if: ${{ startsWith(matrix.os, 'windows') }} - working-directory: .. - shell: pwsh - run: | - Remove-Item -Path "${{ github.workspace }}" -Recurse -Force - New-Item -ItemType Directory -Path "C:\workspace" - New-Item -ItemType SymbolicLink -Path "${{ github.workspace }}" -Target "C:\workspace" + # - name: "Only run on windows" + # if: ${{ startsWith(matrix.os, 'windows') }} + # working-directory: .. + # shell: pwsh + # run: | + # Remove-Item -Path "${{ github.workspace }}" -Recurse -Force + # New-Item -ItemType Directory -Path "C:\workspace" + # New-Item -ItemType SymbolicLink -Path "${{ github.workspace }}" -Target "C:\workspace" - - name: "Remove builtin vcpkg (old)" - working-directory: . - shell: "bash" - run: | - ${{ matrix.sudo }} rm -rf "$VCPKG_INSTALLATION_ROOT" + # - name: "Remove builtin vcpkg (old)" + # working-directory: . + # shell: "bash" + # run: | + # ${{ matrix.sudo }} rm -rf "$VCPKG_INSTALLATION_ROOT" - name: Check out source code uses: actions/checkout@v3 @@ -152,18 +152,12 @@ jobs: setapikey "${{ secrets.GITHUB_TOKEN }}" \ -source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" - - name: "Test vcpkg install" - if: ${{ startsWith(matrix.os, 'windows') }} - working-directory: . - shell: "cmd" - run: | - vcpkg.exe install --x-abi-tools-use-exact-versions --downloads-root=vcpkg_downloads --x-buildtrees-root=vcpkg_buildtrees --x-packages-root=vcpkg_packages --x-install-root=vcpkg_installed --triplet=${{ matrix.triplet }} - - name: "Update nuget (overlays)" working-directory: . shell: "bash" run: | ./vcpkg install --x-abi-tools-use-exact-versions \ + --vcpkg-root=${{ github.workspace }} \ --downloads-root=./vcpkg_downloads \ --x-buildtrees-root=./vcpkg_buildtrees \ --x-packages-root=./vcpkg_packages \