aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/CODEOWNERS2
-rw-r--r--README.md4
-rw-r--r--appveyor.yml22
-rw-r--r--dev/ci/README-developers.md7
-rw-r--r--dev/ci/appveyor.bat42
-rwxr-xr-xdev/tools/merge-pr.sh2
6 files changed, 3 insertions, 76 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 275d6c1ff5..f802040a1d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -30,8 +30,6 @@
# Trick to avoid getting review requests
# each time someone adds an overlay
-/appveyor.yml @coq/ci-maintainers
-/dev/ci/appveyor.* @coq/ci-maintainers
/dev/ci/*.bat @coq/ci-maintainers
*.nix @coq/nix-maintainers
diff --git a/README.md b/README.md
index 65673ab1fe..5df8423ef4 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
[![GitLab][gitlab-badge]][gitlab-link]
[![Azure Pipelines][azure-badge]][azure-link]
-[![Appveyor][appveyor-badge]][appveyor-link]
[![Gitter][gitter-badge]][gitter-link]
[![DOI][doi-badge]][doi-link]
@@ -12,9 +11,6 @@
[azure-badge]: https://dev.azure.com/coq/coq/_apis/build/status/coq.coq?branchName=master
[azure-link]: https://dev.azure.com/coq/coq/_build/latest?definitionId=1?branchName=master
-[appveyor-badge]: https://ci.appveyor.com/api/projects/status/eln43k05pa2vm908/branch/master?svg=true
-[appveyor-link]: https://ci.appveyor.com/project/coq/coq/branch/master
-
[gitter-badge]: https://badges.gitter.im/coq/coq.svg
[gitter-link]: https://gitter.im/coq/coq
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 7420856214..0000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-version: '{branch}~{build}'
-clone_depth: 10
-
-cache:
- - C:\cygwin64 -> dev\ci\appveyor.bat, dev\ci\appveyor.sh
-
-platform:
-- x64
-
-image:
-- Visual Studio 2017
-
-environment:
- CYGMIRROR: http://ftp.inf.tu-dresden.de/software/windows/cygwin32
- matrix:
- - USEOPAM: true
- ARCH: 64
-
-build_script:
-- cmd: 'call %APPVEYOR_BUILD_FOLDER%\dev\ci\appveyor.bat'
-
-test: off
diff --git a/dev/ci/README-developers.md b/dev/ci/README-developers.md
index 10b4f9b044..98ea594366 100644
--- a/dev/ci/README-developers.md
+++ b/dev/ci/README-developers.md
@@ -16,12 +16,9 @@ We are currently running tests on the following platforms:
`./configure`. It should allow complying with this discipline
without pain.
-- AppVeyor is used to test the compilation of Coq and run the test-suite on
- Windows.
-
- Azure Pipelines is used to test the compilation of Coq and run the
- test-suite on Windows and on macOS. It is expected to replace
- appveyor eventually.
+ test-suite on Windows and on macOS. It is expected to be used to build
+ macOS and Windows packages eventually.
You can anticipate the results of most of these tests prior to submitting your
PR by running GitLab CI on your private branches. To do so follow these steps:
diff --git a/dev/ci/appveyor.bat b/dev/ci/appveyor.bat
deleted file mode 100644
index 341b875edc..0000000000
--- a/dev/ci/appveyor.bat
+++ /dev/null
@@ -1,42 +0,0 @@
-REM This script either runs the test suite with OPAM (if USEOPAM is true) or
-REM builds the Coq binary packages for windows (if USEOPAM is false).
-
-if %ARCH% == 32 (
- SET ARCHLONG=i686
- SET CYGROOT=C:\cygwin
- SET SETUP=setup-x86.exe
-)
-
-if %ARCH% == 64 (
- SET ARCHLONG=x86_64
- SET CYGROOT=C:\cygwin64
- SET SETUP=setup-x86_64.exe
-)
-
-SET CYGCACHE=%CYGROOT%\var\cache\setup
-SET APPVEYOR_BUILD_FOLDER_MFMT=%APPVEYOR_BUILD_FOLDER:\=/%
-SET APPVEYOR_BUILD_FOLDER_CFMT=%APPVEYOR_BUILD_FOLDER_MFMT:C:/=/cygdrive/c/%
-SET DESTCOQ=C:\coq%ARCH%_inst
-SET COQREGTESTING=Y
-
-if %USEOPAM% == false (
- call %APPVEYOR_BUILD_FOLDER%\dev\build\windows\MakeCoq_MinGW.bat -threads=1 ^
- -arch=%ARCH% -installer=Y -coqver=%APPVEYOR_BUILD_FOLDER_CFMT% ^
- -destcyg=%CYGROOT% -destcoq=%DESTCOQ% -cygcache=%CYGCACHE% ^
- -addon=bignums -make=N ^
- -setup %CYGROOT%\%SETUP% || GOTO ErrorExit
- copy "%CYGROOT%\build\coq-local\dev\nsis\*.exe" dev\nsis || GOTO ErrorExit
- 7z a coq-opensource-archive-windows-%ARCHLONG%.zip %CYGROOT%\build\tarballs\* || GOTO ErrorExit
-)
-
-if %USEOPAM% == true (
- %CYGROOT%\%SETUP% -qnNdO -R %CYGROOT% -l %CYGCACHE% -s %CYGMIRROR% ^
- -P rsync -P patch -P diffutils -P make -P unzip -P m4 -P findutils -P time
- %CYGROOT%/bin/bash -l %APPVEYOR_BUILD_FOLDER%/dev/ci/appveyor.sh || GOTO ErrorExit
-)
-
-GOTO :EOF
-
-:ErrorExit
- ECHO ERROR %0 failed
- EXIT /b 1
diff --git a/dev/tools/merge-pr.sh b/dev/tools/merge-pr.sh
index 72e2930386..813ad71be9 100755
--- a/dev/tools/merge-pr.sh
+++ b/dev/tools/merge-pr.sh
@@ -143,7 +143,7 @@ fi
# Sanity check: PR has an outdated version of CI
BASE_COMMIT=$(echo "$PRDATA" | jq -r '.base.sha')
-CI_FILES=(".gitlab-ci.yml" "appveyor.yml")
+CI_FILES=(".gitlab-ci.yml" "azure-pipelines.yml")
if ! git diff --quiet "$BASE_COMMIT" "$LOCAL_BRANCH_COMMIT" -- "${CI_FILES[@]}"
then