Skip to content

Commit

Permalink
chore(CI): Update Circle CI config to v2.1 (#992)
Browse files Browse the repository at this point in the history
* chore(CI): Update Circle CI config to v2

* chore(CI): Remove initial command

* chore(CI): Use same image as babel/babel

* chore(CI): Switch to 2.1

* chore(CI): Use similar env as babel

* chore(CI): Remove direct PATH

* chore(CI): Remove comments

* chore(CI): Add submodules back to CI

* chore(CI): Better submodule updating

* chore(CI): Update test commands

* Revert "chore(CI): Update test commands"

This reverts commit 0eda27d.

* chore(CI): Fix prettier errors

* chore(CI): Fix smoke test

* chore(CI): Update jQuery version

* chore(CI): Fix jQuery smoke test

* chore(CI): Don't rebuild jQuery

* chore(CI): Remove unnecessary commands

* chore(CI): Remove unused variables
  • Loading branch information
clarle authored Aug 14, 2020
1 parent cda70da commit 1ad7838
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 25 deletions.
62 changes: 41 additions & 21 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,45 @@
---
version: 2.1

machine:
node:
version: "node"
environment:
PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin:./node_modules/.bin"
aliases:
- &restore-node-modules-cache
keys:
- v1-yarn-deps-{{ checksum "yarn.lock" }}
- v1-yarn-deps-

checkout:
post:
- git submodule sync
- git submodule update --init --recursive
- &restore-yarn-cache
keys:
- v1-1-yarn-cache-{{ checksum "yarn.lock" }}
- v1-1-yarn-cache-

dependencies:
override:
- yarn
cache_directories:
- ~/.cache/yarn
post:
- yarn build
- &save-node-modules-cache
paths:
- node_modules
key: v1-yarn-deps-{{ checksum "yarn.lock" }}

test:
override:
- ./smoke/circleci.sh:
parallel: true
- &save-yarn-cache
paths:
- ~/.cache/yarn
key: v1-1-yarn-cache-{{ checksum "yarn.lock" }}

executors:
node-executor:
docker:
- image: circleci/node:latest
working_directory: ~/babel/minify

jobs:
build:
executor: node-executor
parallelism: 4
steps:
- checkout
- run:
name: "Pull Submodules"
command: git submodule update --init --recursive
- restore_cache: *restore-yarn-cache
- restore_cache: *restore-node-modules-cache
- run: yarn
- run: yarn build
- save_cache: *save-node-modules-cache
- save_cache: *save-yarn-cache
- run: ./smoke/circleci.sh
2 changes: 1 addition & 1 deletion smoke/assets/jquery
Submodule jquery updated 218 files
6 changes: 3 additions & 3 deletions smoke/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ const TESTS = [
{
dir: "html-minifier",
files: "src/htmlminifier.js",
build: "grunt dist",
test: "grunt qunit"
build: "npm run dist",
test: "./node_modules/grunt/bin/grunt qunit"
},
{
dir: "jquery",
files: "dist/jquery.js",
build: "npm run build",
test: "grunt test"
test: "./node_modules/grunt/bin/grunt test:slow"
},
{
dir: "lodash",
Expand Down

0 comments on commit 1ad7838

Please sign in to comment.