From bada6f084127c8e7c1bf511a5df144a19729e07c Mon Sep 17 00:00:00 2001 From: OuGuangyu Date: Fri, 14 Feb 2025 21:55:44 +0800 Subject: [PATCH 1/7] use vcpkg/downloads/nuget.exe, update doc deploy action version --- .github/workflows/cmake.yml | 2 +- .github/workflows/doc.yml | 8 ++++---- .github/workflows/main.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 2d8238b7..70bb1540 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -72,7 +72,7 @@ jobs: shell: pwsh run: | $VCPKG_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg.exe" - $NUGET_EXE="$(.$VCPKG_EXE fetch nuget)" + $NUGET_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg/downloads/nuget.exe" .$NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText .$NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" - name: Vcpkg Package Restore diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 4781667c..318dd6da 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -29,9 +29,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Pages - uses: actions/configure-pages@v3 + uses: actions/configure-pages@v4 - name: Install dependencies run: | sudo apt-get -qq update @@ -43,10 +43,10 @@ jobs: make html working-directory: ./docs - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: # Upload entire repository path: 'docs/_build/html' - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 + uses: actions/deploy-pages@v4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a7830c81..c2f3f370 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,7 +67,7 @@ jobs: shell: pwsh run: | $VCPKG_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg.exe" - $NUGET_EXE="$(.$VCPKG_EXE fetch nuget)" + $NUGET_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg/downloads/nuget.exe" .$NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText .$NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" - name: Vcpkg Package Restore From 992eb955adb9d03d31a638f95dc0ceb4cf0eeb33 Mon Sep 17 00:00:00 2001 From: OuGuangyu Date: Fri, 14 Feb 2025 22:06:59 +0800 Subject: [PATCH 2/7] back to fetch nuget, remove '.' --- .github/workflows/cmake.yml | 6 +++--- .github/workflows/main.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 70bb1540..572ca064 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -72,9 +72,9 @@ jobs: shell: pwsh run: | $VCPKG_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg.exe" - $NUGET_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg/downloads/nuget.exe" - .$NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText - .$NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" + $NUGET_EXE="$(.$VCPKG_EXE fetch nuget)" + $NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText + $NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" - name: Vcpkg Package Restore shell: pwsh run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c2f3f370..aa387aec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,9 +67,9 @@ jobs: shell: pwsh run: | $VCPKG_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg.exe" - $NUGET_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg/downloads/nuget.exe" - .$NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText - .$NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" + $NUGET_EXE="$(.$VCPKG_EXE fetch nuget)" + $NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText + $NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" - name: Vcpkg Package Restore shell: pwsh run: | From 2d862f7ca90d6899378fe415b3fc4f5d6dc4ef02 Mon Sep 17 00:00:00 2001 From: OuGuangyu Date: Fri, 14 Feb 2025 22:16:33 +0800 Subject: [PATCH 3/7] use & instead of . --- .github/workflows/cmake.yml | 4 ++-- .github/workflows/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 572ca064..e8c7e485 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -73,8 +73,8 @@ jobs: run: | $VCPKG_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg.exe" $NUGET_EXE="$(.$VCPKG_EXE fetch nuget)" - $NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText - $NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" + & $NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText + & $NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" - name: Vcpkg Package Restore shell: pwsh run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aa387aec..dff25aad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -68,8 +68,8 @@ jobs: run: | $VCPKG_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg.exe" $NUGET_EXE="$(.$VCPKG_EXE fetch nuget)" - $NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText - $NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" + & $NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText + & $NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" - name: Vcpkg Package Restore shell: pwsh run: | From c569d61ef950c5e3f1aa80a246e7bd02d0f4e0dc Mon Sep 17 00:00:00 2001 From: OuGuangyu Date: Fri, 14 Feb 2025 22:36:01 +0800 Subject: [PATCH 4/7] use github install vcpkg --- .github/workflows/cmake.yml | 7 ++++--- .github/workflows/main.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index e8c7e485..f1b7abc6 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -63,11 +63,12 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Scrollback Vcpkg - shell: pwsh + - name: install Vcpkg + shell: bash run: | cd "$env:VCPKG_INSTALLATION_ROOT" - git switch 2023.12.12 --detach + git clone https://github.com/microsoft/vcpkg.git + ./vcpkg/bootstrap-vcpkg.sh - name: Setup NuGet Credentials shell: pwsh run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dff25aad..8016c5ed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,11 +58,12 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Scrollback Vcpkg - shell: pwsh + - name: install Vcpkg + shell: bash run: | cd "$env:VCPKG_INSTALLATION_ROOT" - git switch 2023.12.12 --detach + git clone https://github.com/microsoft/vcpkg.git + ./vcpkg/bootstrap-vcpkg.sh - name: Setup NuGet Credentials shell: pwsh run: | From 962db63b40e71d7b8da37760c297f263f007202d Mon Sep 17 00:00:00 2001 From: OuGuangyu Date: Fri, 14 Feb 2025 22:47:12 +0800 Subject: [PATCH 5/7] pwsh --- .github/workflows/cmake.yml | 4 ++-- .github/workflows/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index f1b7abc6..8406fc29 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -64,11 +64,11 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: install Vcpkg - shell: bash + shell: pwsh run: | cd "$env:VCPKG_INSTALLATION_ROOT" git clone https://github.com/microsoft/vcpkg.git - ./vcpkg/bootstrap-vcpkg.sh + ./vcpkg/bootstrap-vcpkg.bat - name: Setup NuGet Credentials shell: pwsh run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8016c5ed..fc1b501d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,11 +59,11 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: install Vcpkg - shell: bash + shell: pwsh run: | cd "$env:VCPKG_INSTALLATION_ROOT" git clone https://github.com/microsoft/vcpkg.git - ./vcpkg/bootstrap-vcpkg.sh + ./vcpkg/bootstrap-vcpkg.bat - name: Setup NuGet Credentials shell: pwsh run: | From 5f8177151b0974ae4e5fb05fab6999f3adf94af2 Mon Sep 17 00:00:00 2001 From: OuGuangyu Date: Sun, 23 Feb 2025 20:45:58 +0800 Subject: [PATCH 6/7] switch to vcpkg 2025.02.14 --- .github/workflows/cmake.yml | 3 +-- .github/workflows/main.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 8406fc29..3e5a89d7 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -67,8 +67,7 @@ jobs: shell: pwsh run: | cd "$env:VCPKG_INSTALLATION_ROOT" - git clone https://github.com/microsoft/vcpkg.git - ./vcpkg/bootstrap-vcpkg.bat + git switch 2025.02.14 --detach - name: Setup NuGet Credentials shell: pwsh run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc1b501d..43d55e2a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,8 +62,7 @@ jobs: shell: pwsh run: | cd "$env:VCPKG_INSTALLATION_ROOT" - git clone https://github.com/microsoft/vcpkg.git - ./vcpkg/bootstrap-vcpkg.bat + git switch 2025.02.14 --detach - name: Setup NuGet Credentials shell: pwsh run: | From 75307921e5f37b4f91bc62e17c6686c956b3f59e Mon Sep 17 00:00:00 2001 From: HPDell Date: Sun, 23 Feb 2025 17:09:43 +0000 Subject: [PATCH 7/7] revert: nuget usage --- .github/workflows/cmake.yml | 7 ++++--- .github/workflows/main.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 3e5a89d7..7e8efec6 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -63,18 +63,19 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: install Vcpkg + - name: Restore Vcpkg shell: pwsh run: | cd "$env:VCPKG_INSTALLATION_ROOT" + git fetch git switch 2025.02.14 --detach - name: Setup NuGet Credentials shell: pwsh run: | $VCPKG_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg.exe" $NUGET_EXE="$(.$VCPKG_EXE fetch nuget)" - & $NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText - & $NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" + .$NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText + .$NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" - name: Vcpkg Package Restore shell: pwsh run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 43d55e2a..06982918 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,18 +58,19 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: install Vcpkg + - name: Restore Vcpkg shell: pwsh run: | cd "$env:VCPKG_INSTALLATION_ROOT" + git fetch git switch 2025.02.14 --detach - name: Setup NuGet Credentials shell: pwsh run: | $VCPKG_EXE="$env:VCPKG_INSTALLATION_ROOT/vcpkg.exe" $NUGET_EXE="$(.$VCPKG_EXE fetch nuget)" - & $NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText - & $NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" + .$NUGET_EXE sources add -Source ${{ env.FEED_URL }} -Name github -UserName ${{ env.USERNAME }} -Password ${{ secrets.GITHUB_TOKEN }} -StorePasswordInClearText + .$NUGET_EXE setapikey ${{ secrets.GITHUB_TOKEN }} -Source "${{ env.FEED_URL }}" - name: Vcpkg Package Restore shell: pwsh run: |