From 4417e188b117c82579ce0c44c8d2d6e8c1f24896 Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Sun, 9 Nov 2025 15:51:18 -0500 Subject: [PATCH 1/3] Switch SVN Windows CI installation to winget / TortoiseSVN --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93d09fef27e..b81a9c8ad08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -201,11 +201,12 @@ jobs: python-version: ${{ matrix.python }} allow-prereleases: true - - name: Install SVN via Chocolatey + - name: Install TortoiseSVN CLI shell: pwsh run: | - choco install svn -y --no-progress - echo "C:\Program Files (x86)\Subversion\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + $msiFeatures = "CLI" + $override = "/quiet /norestart ADDLOCAL=$msiFeatures" + winget install --accept-source-agreements --accept-package-agreements -e --id TortoiseSVN.TortoiseSVN --override $override - run: pip install nox From 99f6d93d81387fb416e9dce204f7347d43725f53 Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Sun, 9 Nov 2025 16:06:36 -0500 Subject: [PATCH 2/3] Try Slik.Subversion --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b81a9c8ad08..98de7d6ede8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -201,12 +201,10 @@ jobs: python-version: ${{ matrix.python }} allow-prereleases: true - - name: Install TortoiseSVN CLI + - name: Install Subversion shell: pwsh run: | - $msiFeatures = "CLI" - $override = "/quiet /norestart ADDLOCAL=$msiFeatures" - winget install --accept-source-agreements --accept-package-agreements -e --id TortoiseSVN.TortoiseSVN --override $override + winget install --accept-source-agreements --accept-package-agreements -e --id Slik.Subversion - run: pip install nox From a8ee0ecac61953a98d41af16639895879171d9df Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Sun, 9 Nov 2025 16:16:55 -0500 Subject: [PATCH 3/3] Add to path --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98de7d6ede8..da3e4d02836 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -205,6 +205,7 @@ jobs: shell: pwsh run: | winget install --accept-source-agreements --accept-package-agreements -e --id Slik.Subversion + echo "C:\Program Files\SlikSvn\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - run: pip install nox