From b7f8ffebb7476a6a9d80dddff54b0ba6d88ea173 Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Thu, 12 Mar 2020 20:49:02 -0700 Subject: [PATCH] Revert "Move MS Windows build to CircleCI (#17984)" This reverts commit 885ed469096d4da7ca038564b323e9b706f5a6d0. --- .circleci/config.yml | 46 +------------------------------------------- appveyor.yml | 41 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 45 deletions(-) create mode 100644 appveyor.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 5fd9537de487c..d5d0e4f8f488b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,4 @@ -version: 2.1 - -orbs: - win: circleci/windows@2.4.0 +version: 2 aliases: - &docker @@ -51,9 +48,6 @@ aliases: paths: - bundle-sizes.json - - &ms_windows_environment - JAVA_HOME: C:\Program Files\Java\jdk1.8.0 - jobs: setup: docker: *docker @@ -470,38 +464,6 @@ jobs: RELEASE_CHANNEL: experimental command: yarn test-build-prod --maxWorkers=2 - test_ms_windows: - executor: - name: win/default - environment: *ms_windows_environment - steps: - - run: - # Fix line endings in Windows. - command: git config --global core.autocrlf input - - checkout - - restore_cache: - keys: - - v2-win-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }} - - v2-win-node-{{ arch }}-{{ .Branch }}- - - v2-win-node-{{ arch }}- - - run: - command: node --version - - run: - command: choco install yarn - - *run_yarn - - save_cache: - key: v2-win-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }} - paths: - - C:\Users\circleci\AppData\Local\Yarn - - run: - command: yarn lint - - run: - command: yarn build - - run: - command: yarn test - - run: - command: yarn prettier - workflows: version: 2 stable: @@ -616,9 +578,3 @@ workflows: - test_fuzz: requires: - setup - - ms_windows: - jobs: - - test_ms_windows - - diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000000000..8191e610a95ff --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,41 @@ +image: Visual Studio 2017 + +# Fix line endings in Windows. (runs before repo cloning) +init: + - git config --global core.autocrlf input + +environment: + JAVA_HOME: C:\Program Files\Java\jdk1.8.0 + matrix: + - nodejs_version: 10 + +# Finish on first failed build +matrix: + fast_finish: true + +platform: + - x64 + +branches: + only: + - master + +# Disable Visual Studio build and deploy +build: off +deploy: off + +install: + - ps: Install-Product node $env:nodejs_version $env:platform + - yarn install --frozen-lockfile + +test_script: + - node --version + - yarn lint +# - yarn flow-ci + - yarn build + - yarn test + - yarn prettier + +cache: + - node_modules + - "%LOCALAPPDATA%/Yarn"