From 7dbc82912ae31e3bcf9f848ba0e83291321d79aa Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 28 Dec 2020 21:19:18 -0500 Subject: [PATCH 1/2] ci(appveyor): Remove now that GHA is testing Windows --- appveyor.yml | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 01ca16f930..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,39 +0,0 @@ -version: '{build}' -environment: - APPVEYOR_CACHE_ENTRY_ZIP_ARGS: "-t7z -m0=lzma -mx=9" - DEPS_BUILD_DIR: "C:/projects/nvim-deps" - DEPS_PREFIX: "C:/projects/nvim-deps/usr" - # Silence/redirect errors due to missing locking support (via libgcov). - GCOV_ERROR_FILE: "$(TEMP)/libgcov-errors.log" -image: Visual Studio 2017 -configuration: -- MINGW_64-gcov -- MINGW_32 -- MSVC_64 -- MSVC_32 -init: -- ps: | - # Pull requests: skip some build configurations to save time. - if ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -and $env:CONFIGURATION -match '^(MSVC_64|MINGW_32)$') { - $env:APPVEYOR_CACHE_SKIP_SAVE = "true" - Exit-AppVeyorBuild - } -# RDP -#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) -matrix: - fast_finish: true -build_script: -- powershell ci\build.ps1 -after_build: -- ps: | - if (Test-Path $env:GCOV_ERROR_FILE) { - Get-Content $env:GCOV_ERROR_FILE -Head 10 - Get-Content $env:GCOV_ERROR_FILE -Tail 10 - } else { - write-host "no GCOV_ERROR_FILE" - } -cache: -- C:\projects\nvim-deps -> third-party\** -artifacts: -- path: build/Neovim.zip -- path: build/bin/nvim.exe From 18512649e662819f09d8e386fb9ea727d60fdcb5 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 28 Dec 2020 21:19:48 -0500 Subject: [PATCH 2/2] ci(travis): Remove jobs covered by GHA --- .travis.yml | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index b68f4f1bc1..06547febba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,24 +96,6 @@ addons: jobs: include: - - stage: baseline - name: clang-asan - os: linux - compiler: clang-11 - # Use Lua so that ASAN can test our embedded Lua support. 8fec4d53d0f6 - env: - - CLANG_SANITIZER=ASAN_UBSAN - - CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON" - - SYMBOLIZER=asan_symbolize-11 - - *common-job-env - addons: - apt: - sources: - - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main' - key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' - packages: - - *common-apt-packages - - clang-11 - name: gcc-coverage (gcc 9) os: linux compiler: gcc-9 @@ -134,20 +116,6 @@ jobs: packages: - *common-apt-packages - gcc-9 - - if: branch = master AND commit_message !~ /\[skip.lint\]/ - name: lint - os: linux - env: - - CI_TARGET=lint - - *common-job-env - - - stage: second stage - name: "macOS: clang" - os: osx - compiler: clang - osx_image: xcode10.2 # macOS 10.14 - env: - - *common-job-env - name: gcc-functionaltest-lua os: linux compiler: gcc @@ -188,12 +156,6 @@ jobs: - python3-setuptools - python-dev - python3-dev - - name: clang-tsan - os: linux - compiler: clang - env: - - CLANG_SANITIZER=TSAN - - *common-job-env - if: type != pull_request name: snap os: linux