diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 02dd056..fd5ad53 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -46,15 +46,17 @@ jobs: fetch-depth: 1 - name: 🐾 Bootstrap vcpkg - shell: powershell + shell: bash run: | PKG_SOURCE_USER=$(echo $GITHUB_REPOSITORY | cut -d '/' -f 1) ./vcpkg/bootstrap-vcpkg.sh - .$(./vcpkg/vcpkg fetch nuget) sources add -Name ghpkg -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json" -UserName "$PKG_SOURCE_USER" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText - .$(./vcpkg/vcpkg fetch nuget) setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json" + NUGET_EXE=$(./vcpkg/vcpkg fetch nuget) + echo "Downloaded $NUGET_EXE" + $NUGET_EXE sources add -Name ghpkg -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json" -UserName "$PKG_SOURCE_USER" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText + $NUGET_EXE setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json" echo "VCPKG_BINARY_SOURCES=clear;nuget,https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json,readwrite" >> $GITHUB_ENV - echo "PATH=$env:VCPKG_ROOT;$env:PATH" >> $GITHUB_ENV - echo "VCPKG_ROOT=$env:VCPKG_ROOT" >> $GITHUB_ENV + echo "PATH=$VCPKG_ROOT;$PATH" >> $GITHUB_ENV + echo "VCPKG_ROOT=$VCPKG_ROOT" >> $GITHUB_ENV - name: 🌋 Build run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4960c09..ce45d4d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -41,15 +41,17 @@ jobs: fetch-depth: 1 - name: 🐾 Bootstrap vcpkg - shell: powershell + shell: bash run: | - $PKG_SOURCE_USER = $env:GITHUB_REPOSITORY -split '/' | Select-Object -First 1 - .\vcpkg\bootstrap-vcpkg.bat - .$(.\vcpkg\vcpkg.exe fetch nuget) sources add -Name ghpkg -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json" -UserName "$PKG_SOURCE_USER" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText - .$(.\vcpkg\vcpkg.exe fetch nuget) setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json" - echo "VCPKG_BINARY_SOURCES=clear;nuget,https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json,readwrite" >> $env:GITHUB_ENV - echo "PATH=$env:VCPKG_ROOT;$env:PATH" >> $env:GITHUB_ENV - echo "VCPKG_ROOT=$env:VCPKG_ROOT" >> $env:GITHUB_ENV + PKG_SOURCE_USER=$(echo $GITHUB_REPOSITORY | cut -d '/' -f 1) + ./vcpkg/bootstrap-vcpkg.sh + NUGET_EXE=$(./vcpkg/vcpkg fetch nuget) + echo "Downloaded $NUGET_EXE" + $NUGET_EXE sources add -Name ghpkg -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json" -UserName "$PKG_SOURCE_USER" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText + $NUGET_EXE setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json" + echo "VCPKG_BINARY_SOURCES=clear;nuget,https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json,readwrite" >> $GITHUB_ENV + echo "PATH=$VCPKG_ROOT;$PATH" >> $GITHUB_ENV + echo "VCPKG_ROOT=$VCPKG_ROOT" >> $GITHUB_ENV - name: 🌋 Build run: |