Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move MS Windows build to CircleCI #17984

Merged
merged 2 commits into from
Mar 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 45 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
version: 2
version: 2.1

orbs:
win: circleci/windows@2.4.0

aliases:
- &docker
Expand Down Expand Up @@ -48,6 +51,9 @@ 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 @@ -352,6 +358,38 @@ 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
Comment on lines +367 to +368
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😑 Do we need to do this if we aren't making any commits? Also, doesn't input really only map to *nix use? (https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration#_code_core_autocrlf_code)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was copied from the AppVeyor config. We can try if it works without.

- checkout
- restore_cache:
keys:
- v2-win-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
- v2-win-node-{{ arch }}-{{ .Branch }}-
- v2-win-node-{{ arch }}-
Comment on lines +370 to +374
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this just be - *restore_yarn_cache? Looks like that's what is used elsewhere for this step.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are using a different cache key for Win and Linux, since the files and folders might not be exactly the same - so we can't use the same restore step.

- 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 @@ -439,3 +477,9 @@ workflows:
- test_fuzz:
requires:
- setup

ms_windows:
jobs:
- test_ms_windows


41 changes: 0 additions & 41 deletions appveyor.yml

This file was deleted.