From efb2c36b1e9d52a9249c9cfda2af1cdc945dd97c Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Wed, 4 Sep 2024 13:37:16 +0200 Subject: [PATCH] ci: remove swigwin setup from workflows --- .github/workflows/amd64_windows_cmake_dotnet.yml | 7 ------- .github/workflows/amd64_windows_cmake_java.yml | 7 ------- .github/workflows/amd64_windows_cmake_python.yml | 7 ------- cmake/dependencies/SWIG.CMakeLists.txt.in | 2 +- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/.github/workflows/amd64_windows_cmake_dotnet.yml b/.github/workflows/amd64_windows_cmake_dotnet.yml index e5b676f5a79..fc8100fa3c5 100644 --- a/.github/workflows/amd64_windows_cmake_dotnet.yml +++ b/.github/workflows/amd64_windows_cmake_dotnet.yml @@ -16,13 +16,6 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v4 - - name: Install SWIG 4.2.1 - run: | - (New-Object System.Net.WebClient).DownloadFile("http://prdownloads.sourceforge.net/swig/swigwin-4.2.1.zip","swigwin-4.2.1.zip"); - Expand-Archive .\swigwin-4.2.1.zip .; - echo "$((Get-Item .).FullName)/swigwin-4.2.1" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - - name: Check swig - run: swig -version - name: Setup .NET 6.0 uses: actions/setup-dotnet@v4 with: diff --git a/.github/workflows/amd64_windows_cmake_java.yml b/.github/workflows/amd64_windows_cmake_java.yml index 2bf265b6a24..1dc8056b8e8 100644 --- a/.github/workflows/amd64_windows_cmake_java.yml +++ b/.github/workflows/amd64_windows_cmake_java.yml @@ -40,13 +40,6 @@ jobs: run: | java -version mvn --version - - name: Install SWIG 4.2.1 - run: | - (New-Object System.Net.WebClient).DownloadFile("http://prdownloads.sourceforge.net/swig/swigwin-4.2.1.zip","swigwin-4.2.1.zip"); - Expand-Archive .\swigwin-4.2.1.zip .; - echo "$((Get-Item .).FullName)/swigwin-4.2.1" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - - name: Check swig - run: swig -version - name: Check cmake run: cmake --version - name: Configure diff --git a/.github/workflows/amd64_windows_cmake_python.yml b/.github/workflows/amd64_windows_cmake_python.yml index 1126ab356d2..f280c787dbd 100644 --- a/.github/workflows/amd64_windows_cmake_python.yml +++ b/.github/workflows/amd64_windows_cmake_python.yml @@ -27,13 +27,6 @@ jobs: python-version: ${{ matrix.python.version }} - name: Install python3 run: python3 -m pip install --user mypy-protobuf absl-py setuptools wheel numpy pandas - - name: Install SWIG 4.2.1 - run: | - (New-Object System.Net.WebClient).DownloadFile("http://prdownloads.sourceforge.net/swig/swigwin-4.2.1.zip","swigwin-4.2.1.zip"); - Expand-Archive .\swigwin-4.2.1.zip .; - echo "$((Get-Item .).FullName)/swigwin-4.2.1" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - - name: Check swig - run: swig -version - name: Add Python binaries to path run: > echo "$((Get-Item ~).FullName)/AppData/Roaming/Python/${{ matrix.python.dir }}/Scripts" | diff --git a/cmake/dependencies/SWIG.CMakeLists.txt.in b/cmake/dependencies/SWIG.CMakeLists.txt.in index 08502562937..89be36cb37e 100644 --- a/cmake/dependencies/SWIG.CMakeLists.txt.in +++ b/cmake/dependencies/SWIG.CMakeLists.txt.in @@ -11,7 +11,7 @@ ExternalProject_Add(SWIG_project SOURCE_DIR "@CMAKE_CURRENT_BINARY_DIR@/${PROJECT_NAME}/source" BUILD_IN_SOURCE 1 - URL "http://prdownloads.sourceforge.net/swig/swigwin-4.1.1.zip" + URL "http://prdownloads.sourceforge.net/swig/swigwin-4.2.1.zip" LOG_DOWNLOAD TRUE UPDATE_COMMAND ""