Windows support was deprecated in v3.7, it's time to remove it, starting with the CI integration.
Removing the yaml configuration file, CI build scripts and the mentions of AppVeyor in the docs. Signed-off-by: Ilya Maximets <[email protected]> --- .ci/windows-build.sh | 17 ----- .ci/windows-prepare.sh | 11 ---- Documentation/intro/install/windows.rst | 9 --- Makefile.am | 3 - README.rst | 2 - appveyor.yml | 87 ------------------------- utilities/checkpatch_dict.txt | 1 - 7 files changed, 130 deletions(-) delete mode 100644 .ci/windows-build.sh delete mode 100644 .ci/windows-prepare.sh delete mode 100644 appveyor.yml diff --git a/.ci/windows-build.sh b/.ci/windows-build.sh deleted file mode 100644 index e54fbacf4..000000000 --- a/.ci/windows-build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -ex - -CONFIGURATION=$1 - -./boot.sh -./configure CC=build-aux/cccl LD="$(which link)" \ - LIBS="-lws2_32 -lShlwapi -liphlpapi -lwbemuuid -lole32 -loleaut32" \ - --prefix=C:/openvswitch/usr --localstatedir=C:/openvswitch/var \ - --sysconfdir=C:/openvswitch/etc --with-pthread=c:/PTHREADS-BUILT/ \ - --enable-ssl --with-openssl=C:/OpenSSL-Win64 \ - --with-vstudiotarget="${CONFIGURATION}" || (cat config.log && exit 1) - -make -j4 -make datapath_windows_analyze -make install -make windows_installer diff --git a/.ci/windows-prepare.sh b/.ci/windows-prepare.sh deleted file mode 100644 index 2d76add71..000000000 --- a/.ci/windows-prepare.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -ex - -mkdir -p /var/cache/pacman/pkg/ -pacman -S --noconfirm --needed automake autoconf libtool make patch - -# Use an MSVC linker and a Windows version of Python. -mv $(which link) $(which link)_copy -mv $(which python3) $(which python3)_copy - -cd /c/pthreads4w-code && nmake all install diff --git a/Documentation/intro/install/windows.rst b/Documentation/intro/install/windows.rst index 2ca3a4e26..ef398e583 100644 --- a/Documentation/intro/install/windows.rst +++ b/Documentation/intro/install/windows.rst @@ -1087,15 +1087,6 @@ To stop and delete the services, run: > sc delete ovs-vswitchd > sc delete ovsdb-server -Windows CI Service ------------------- - -`AppVeyor <https://www.appveyor.com>`__ provides a free Windows autobuild -service for open source projects. Open vSwitch has integration with AppVeyor -for continuous build. A developer can build test his changes for Windows by -logging into appveyor.com using a github account, creating a new project by -linking it to his development repository in github and triggering a new build. - TODO ---- diff --git a/Makefile.am b/Makefile.am index a805f21d1..e6ac79c51 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,13 +83,10 @@ EXTRA_DIST = \ .ci/linux-prepare.sh \ .ci/osx-build.sh \ .ci/osx-prepare.sh \ - .ci/windows-build.sh \ - .ci/windows-prepare.sh \ .cirrus.yml \ .editorconfig \ .github/workflows/build-and-test.yml \ .readthedocs.yaml \ - appveyor.yml \ boot.sh \ $(MAN_FRAGMENTS) \ $(MAN_ROOTS) \ diff --git a/README.rst b/README.rst index 649dc1d38..186d21d07 100644 --- a/README.rst +++ b/README.rst @@ -8,8 +8,6 @@ Open vSwitch .. image:: https://github.com/openvswitch/ovs/workflows/Build%20and%20Test/badge.svg :target: https://github.com/openvswitch/ovs/actions -.. image:: https://ci.appveyor.com/api/projects/status/github/openvswitch/ovs?branch=main&svg=true&retina=true - :target: https://ci.appveyor.com/project/blp/ovs/history .. image:: https://api.cirrus-ci.com/github/openvswitch/ovs.svg :target: https://cirrus-ci.com/github/openvswitch/ovs .. image:: https://readthedocs.org/projects/openvswitch/badge/?version=latest diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 28a75c3af..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,87 +0,0 @@ -version: 1.0.{build} -image: Visual Studio 2019 -branches: - only: - - main -configuration: - - Debug - - Release -clone_folder: C:\openvswitch_compile -shallow_clone: true - -init: -- ps: $env:PATH ="C:\Python312-x64;C:\Python312-x64\Scripts;"+$env:PATH -- ps: New-Item -Type HardLink -Path "C:\Python312-x64\python3.exe" - -Value "C:\Python312-x64\python.exe" - -cache: -- C:\ovs-build-downloads - -install: -- ps: | - $OpenSSLPath = "C:\OpenSSL-Win64" - if (Test-Path $OpenSSLPath) { - Remove-Item -Recurse -Force -Path $OpenSSLPath - } - New-Item -ItemType Directory -Force -Path C:\ovs-build-downloads - - # Find and download the latest stable OpenSSl 3.0. - $URL = "https://raw.githubusercontent.com/slproweb/opensslhashes/master/win32_openssl_hashes.json"; - $webData = (Invoke-WebRequest -Uri $URL).content | ConvertFrom-Json - $source = ($webData.files.PSObject.Properties | Where-Object { - $_.Value.basever -match "^3\.0\.[0-9]+" -and - $_.Value.bits -eq "64" -and - $_.Value.arch -eq "INTEL" -and - $_.Value.installer -eq "exe" -and - -not $_.Value.light - } | Select-Object Value | Select -First 1).PSObject.Properties.Value - - Write-Host "Latest OpenSSL 3.0:" ($source | Format-List | Out-String) - - $destination = "C:\ovs-build-downloads\Win64OpenSSL.exe" - if (Test-Path $destination) { - $fileHash = (Get-FileHash $destination -Algorithm SHA256).Hash.ToLower() - if ($fileHash -ne $source.sha256) { - Write-Host "Cache miss:" $fileHash "!=" $source.sha256 - Remove-Item -Path $destination - } - } - - if (Test-Path $destination) { - Write-Host "Using cached:" $destination - } else { - Write-Host "Downloading:" $source.url - Invoke-WebRequest $source.url -OutFile $destination - } - - Write-Host "Installing:" $destination - $installArgs = @{ - FilePath = $destination - ArgumentList = '/silent /verysilent /sp- /suppressmsgboxes ' + - '/DIR="' + $OpenSSLPath + '"' - Wait = $true - } - Start-Process @installArgs - -- ps: git clone -q https://git.code.sf.net/p/pthreads4w/code c:\pthreads4w-code -- ps: python3 -m pip install pypiwin32 --disable-pip-version-check -- '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"' -- ps: C:\msys64\msys2_shell.cmd -here -defterm -no-start -use-full-path -c - ".ci/windows-prepare.sh 2>&1" - -build_script: -- ps: C:\msys64\msys2_shell.cmd -here -defterm -no-start -use-full-path -c - ".ci/windows-build.sh $env:CONFIGURATION 2>&1" -- ps: cp C:\PTHREADS-BUILT\bin\pthreadVC3.dll C:\openvswitch\usr\bin -- ps: cp C:\PTHREADS-BUILT\bin\pthreadVC3.dll C:\openvswitch\usr\sbin -- ps: mkdir C:\openvswitch\driver -- ps: cp datapath-windows\x64\Win10$env:CONFIGURATION\package\* C:\openvswitch\driver -- ps: cp datapath-windows\x64\Win10$env:CONFIGURATION\package.cer C:\openvswitch\driver -- ps: cp datapath-windows\misc\* C:\openvswitch\driver -- ps: cp windows\ovs-windows-installer\bin\x64\Release\OpenvSwitch.msi - c:\OpenvSwitch-$env:CONFIGURATION.msi - -after_build: -- ps: 7z a C:\ovs-main-$env:CONFIGURATION.zip C:\openvswitch -- ps: Push-AppveyorArtifact C:\ovs-main-$env:CONFIGURATION.zip -- ps: Push-AppveyorArtifact C:\OpenvSwitch-$env:CONFIGURATION.msi diff --git a/utilities/checkpatch_dict.txt b/utilities/checkpatch_dict.txt index c1f43e5af..dfd3bb594 100644 --- a/utilities/checkpatch_dict.txt +++ b/utilities/checkpatch_dict.txt @@ -7,7 +7,6 @@ amd64 api apis appctl -appveyor arg arp asan -- 2.53.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
