Skip to content

Commit

Permalink
chore: use yarn berry (#10188)
Browse files Browse the repository at this point in the history
Co-authored-by: Maël Nison <nison.mael@gmail.com>
  • Loading branch information
SimenB and arcanis committed Jul 5, 2020
1 parent eb9c568 commit 7946ba6
Show file tree
Hide file tree
Showing 40 changed files with 29,856 additions and 168,676 deletions.
12 changes: 7 additions & 5 deletions .azure-pipelines-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@ steps:
versionSpec: '2.7'
displayName: 'Use Python 2.7'

# Run yarn to install dependencies and build
- script: node scripts/remove-postinstall
displayName: 'Remove postinstall script'
- bash: echo "##vso[task.setvariable variable=folder;isOutput=true]$(yarn config get cacheFolder)"
name: yarnCache

- task: Cache@2
inputs:
key: yarn | $(Agent.OS) | yarn.lock
path: $(YARN_CACHE_FOLDER)
path: $(yarnCache.folder)
displayName: Cache Yarn packages

- script: yarn install-no-ts-build
- script: yarn install
displayName: 'Install dependencies'

- script: yarn build:js
displayName: 'Transpile TypeScript'

# Run test-ci-partial
- script: yarn run test-ci-partial
displayName: 'Run tests'
Expand Down
2 changes: 0 additions & 2 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,3 @@ variables:

# Ensures the handful of tests that should be skipped during CI are
CI: true

YARN_CACHE_FOLDER: $(Pipeline.Workspace)/.yarn
11 changes: 5 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
aliases:
- &restore-cache
keys:
- v2-dependencies-{{ .Branch }}-{{ checksum "yarn.lock" }}
- v3-dependencies-{{ .Branch }}-{{ checksum "yarn.lock" }}
# Fallback in case checksum fails
- v2-dependencies-{{ .Branch }}-
- v3-dependencies-{{ .Branch }}-

- &save-cache
paths:
- node_modules
- website/node_modules
key: v2-dependencies-{{ .Branch }}-{{ checksum "yarn.lock" }}
- ~/.cache/yarn
key: v3-dependencies-{{ .Branch }}-{{ checksum "yarn.lock" }}

- &filter-ignore-gh-pages
branches:
ignore: gh-pages
- &install yarn install-no-ts-build
- &install yarn install && yarn build:js

version: 2
jobs:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v2
- name: Get yarn cache
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
- uses: actions/cache@v2
with:
path: ${{ steps.yarn-cache.outputs.dir }}
Expand All @@ -36,11 +36,9 @@ jobs:
with:
node-version: 12.x
- name: install
run: yarn install-no-ts-build
run: yarn
- name: build
run: node scripts/build.js
- name: run tsc
run: yarn build:ts
run: yarn build
- name: verify TypeScript@3.8 compatibility
run: yarn verify-old-ts
- name: run eslint
Expand Down Expand Up @@ -68,7 +66,7 @@ jobs:
- uses: actions/checkout@v2
- name: Get yarn cache
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
- uses: actions/cache@v2
with:
path: ${{ steps.yarn-cache.outputs.dir }}
Expand All @@ -80,7 +78,9 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- name: install
run: yarn install-no-ts-build
run: yarn
- name: build
run: yarn build:js
- name: run tests
run: yarn test-ci-partial
env:
Expand Down
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ branches:
only:
- master

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH="$HOME/.yarn/bin:$PATH"

install: yarn install-no-ts-build
install: yarn

cache:
yarn: true
Expand All @@ -20,4 +16,5 @@ cache:
- 'node_modules'

script:
- yarn build:js
- yarn run test-ci-partial
39 changes: 39 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

Loading

0 comments on commit 7946ba6

Please sign in to comment.