From 240be9b5ae5f12cc9861dbc3ffddfd3b16f9b9d7 Mon Sep 17 00:00:00 2001 From: Derek Bailey Date: Mon, 31 Jan 2022 21:52:15 -0800 Subject: attempt to remove appveyor (#7056) --- .github/labeler.yml | 2 -- appveyor.yml | 63 ----------------------------------------------------- conan/build.py | 11 ---------- readme.md | 1 - tests/RustTest.bat | 2 -- 5 files changed, 79 deletions(-) delete mode 100644 appveyor.yml diff --git a/.github/labeler.yml b/.github/labeler.yml index 03fd1a1c..5de0c3a7 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -86,11 +86,9 @@ documentation: CI: - '.github/**/*' - - '.appveyor/**/*' - '.travis/**/*' - '.bazelci/**/*' - .travis.yml - - appveyor.yml grpc: - grpc/**/* diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index c54aed0c..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,63 +0,0 @@ -branches: - only: - - master - -environment: - nodejs_version: "14" - - global: - # Workaround for https://github.com/conda/conda-build/issues/636 - PYTHONIOENCODING: UTF-8 - CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64" - CMAKE_OPTIONS: "" - CPP_TEST_OPTIONS: "" - CHECK_GEN_CODE: 1 - - matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - CMAKE_VS_VERSION: "14 2015" - -platform: - - x86 - - x64 - -configuration: - - Debug - - Release - -before_build: - - cmake . -G"Visual Studio %CMAKE_VS_VERSION%" -DFLATBUFFERS_CODE_SANITIZE=1 %CMAKE_OPTIONS% - # This cuts down on a lot of noise generated by xamarin warnings. - - if exist "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets" - -build: - project: ALL_BUILD.vcxproj - verbosity: minimal - -after_build: - - python conan/appveyor/install.py - - python conan/appveyor/build.py - -install: - - set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%; - - ps: Install-Product node $env:nodejs_version - -test_script: - - if [%CHECK_GEN_CODE%]==[1] (call py scripts/check_generate_code.py "%CPP_TEST_OPTIONS%") - - "cd tests" - - 7z a GeneratedMyGameCode.zip MyGame\ - - rem "---------------- C++ -----------------" - - "cd .." - - "%CONFIGURATION%\\flattests.exe" - - rem "---------------- JS -----------------" - - "node --version" - - "npm install" - - "npm run compile" - - "cd tests" - - "TypeScriptTest.bat" - -artifacts: - - path: $(CONFIGURATION)\flatc.exe - name: flatc.exe - - path: tests\GeneratedMyGameCode.zip - name: GeneratedMyGameCode.zip diff --git a/conan/build.py b/conan/build.py index 55456311..9a857188 100644 --- a/conan/build.py +++ b/conan/build.py @@ -6,16 +6,6 @@ import subprocess from cpt.packager import ConanMultiPackager -def set_appveyor_environment(): - if os.getenv("APPVEYOR") is not None: - compiler_version = os.getenv("CMAKE_VS_VERSION").split(" ")[0].replace('"', '') - os.environ["CONAN_VISUAL_VERSIONS"] = compiler_version - os.environ["CONAN_STABLE_BRANCH_PATTERN"] = "master" - ci_platform = os.getenv("Platform").replace('"', '') - ci_platform = "x86" if ci_platform == "x86" else "x86_64" - os.environ["CONAN_ARCHS"] = ci_platform - os.environ["CONAN_BUILD_TYPES"] = os.getenv("Configuration").replace('"', '') - def get_branch(): try: @@ -56,7 +46,6 @@ if __name__ == "__main__": stable_branch_pattern = os.getenv("CONAN_STABLE_BRANCH_PATTERN", r"v\d+\.\d+\.\d+.*") test_folder = os.getenv("CPT_TEST_FOLDER", os.path.join("conan", "test_package")) upload_only_when_stable = os.getenv("CONAN_UPLOAD_ONLY_WHEN_STABLE", True) - set_appveyor_environment() builder = ConanMultiPackager(reference=get_reference(username), username=username, diff --git a/readme.md b/readme.md index dd4181d2..649cf243 100644 --- a/readme.md +++ b/readme.md @@ -2,7 +2,6 @@ =========== ![Build status](https://github.com/google/flatbuffers/actions/workflows/build.yml/badge.svg?branch=master) -[![Build status](https://ci.appveyor.com/api/projects/status/yg5idd2fnusv1n10?svg=true)](https://ci.appveyor.com/project/gwvo/flatbuffers) [![Join the chat at https://gitter.im/google/flatbuffers](https://badges.gitter.im/google/flatbuffers.svg)](https://gitter.im/google/flatbuffers?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Discord Chat](https://img.shields.io/discord/656202785926152206.svg)](https:///discord.gg/6qgKs3R) [![Twitter Follow](https://img.shields.io/twitter/follow/wvo.svg?style=social)](https://twitter.com/wvo) diff --git a/tests/RustTest.bat b/tests/RustTest.bat index 1473ffbe..e897534c 100644 --- a/tests/RustTest.bat +++ b/tests/RustTest.bat @@ -15,8 +15,6 @@ rem limitations under the License. rem Compile then run the Rust test. -rem TODO(rw): how do we make this script abort the calling script in appveyor? - cd rust_usage_test cargo test -- --quiet || exit /b 1 cargo run --bin=flatbuffers_alloc_check || exit /b 1 -- cgit v1.2.3