Skip to content

Commit

Permalink
Revert "Move MS Windows build to CircleCI (#17984)"
Browse files Browse the repository at this point in the history
This reverts commit 885ed46.
  • Loading branch information
acdlite authored Mar 13, 2020
1 parent 885ed46 commit b7f8ffe
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 45 deletions.
46 changes: 1 addition & 45 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
version: 2.1

orbs:
win: circleci/windows@2.4.0
version: 2

aliases:
- &docker
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -616,9 +578,3 @@ workflows:
- test_fuzz:
requires:
- setup

ms_windows:
jobs:
- test_ms_windows


41 changes: 41 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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"

0 comments on commit b7f8ffe

Please sign in to comment.