Skip to content

Commit 083ce36

Browse files
phatedphated
committedAug 16, 2020
Scaffold: Upgrade to v2 of template
1 parent f826c7a commit 083ce36

9 files changed

+202
-48
lines changed
 

‎.ci/.azure-pipelines-steps.yml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
steps:
2+
- script: npm i -g npm@$(npm_version)
3+
displayName: Use legacy npm version $(npm_version)
4+
condition: ne(variables['npm_version'], '')
5+
6+
- task: NodeTool@0
7+
inputs:
8+
versionSpec: '$(node_version)'
9+
displayName: Use Node $(node_version)
10+
11+
- script: npm install
12+
displayName: npm install
13+
14+
- script: npm test
15+
displayName: Run tests
16+
17+
- script: npm run coveralls
18+
displayName: Run coveralls
19+
env:
20+
# Pretend to be AppVeyor for now
21+
APPVEYOR: true
22+
APPVEYOR_BUILD_NUMBER: $(Build.BuildNumber)
23+
APPVEYOR_BUILD_ID: $(Agent.OS)_$(node_version)
24+
APPVEYOR_REPO_COMMIT: $(Build.SourceVersion)
25+
APPVEYOR_REPO_BRANCH: $(Build.SourceBranchName)
26+
# Overwrite the AppVeyor Service Name
27+
COVERALLS_SERVICE_NAME: Azure Pipelines
28+
COVERALLS_REPO_TOKEN: $(COVERALLS_REPO_TOKEN_SECRET)
29+
COVERALLS_PARALLEL: true
30+
CI_PULL_REQUEST: $(System.PullRequest.PullRequestNumber)
31+
32+
- script: npm run azure-pipelines
33+
displayName: Write tests to xml
34+
35+
- task: PublishTestResults@2
36+
inputs:
37+
testResultsFiles: '**/test.xunit'
38+
condition: succeededOrFailed()

‎.ci/.azure-pipelines.yml

+90
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
trigger:
2+
- master
3+
- releases/*
4+
5+
jobs:
6+
- job: Test_Linux
7+
displayName: Run Tests on Linux
8+
pool:
9+
vmImage: "Ubuntu 16.04"
10+
strategy:
11+
matrix:
12+
Node_v12:
13+
node_version: 12
14+
Node_v10:
15+
node_version: 10
16+
Node_v8:
17+
node_version: 8
18+
Node_v6:
19+
node_version: 6
20+
Node_v4:
21+
node_version: 4
22+
Node_v0_12:
23+
node_version: 0.12
24+
Node_v0_10:
25+
node_version: 0.10
26+
steps:
27+
- template: .azure-pipelines-steps.yml
28+
29+
- job: Test_Windows
30+
displayName: Run Tests on Windows
31+
pool:
32+
vmImage: vs2017-win2016
33+
strategy:
34+
matrix:
35+
Node_v12:
36+
node_version: 12
37+
Node_v10:
38+
node_version: 10
39+
Node_v8:
40+
node_version: 8
41+
Node_v6:
42+
node_version: 6
43+
Node_v4:
44+
node_version: 4
45+
npm_version: 2
46+
Node_v0_12:
47+
node_version: 0.12
48+
npm_version: 2
49+
Node_v0_10:
50+
node_version: 0.10
51+
npm_version: 2
52+
steps:
53+
- template: .azure-pipelines-steps.yml
54+
55+
- job: Test_MacOS
56+
displayName: Run Tests on MacOS
57+
pool:
58+
vmImage: macos-10.13
59+
strategy:
60+
matrix:
61+
Node_v12:
62+
node_version: 12
63+
Node_v10:
64+
node_version: 10
65+
Node_v8:
66+
node_version: 8
67+
Node_v6:
68+
node_version: 6
69+
Node_v4:
70+
node_version: 4
71+
Node_v0_12:
72+
node_version: 0.12
73+
Node_v0_10:
74+
node_version: 0.10
75+
steps:
76+
- template: .azure-pipelines-steps.yml
77+
78+
- job: Notify_Coveralls
79+
displayName: Notify Coveralls that the parallel report is done
80+
pool:
81+
vmImage: "Ubuntu 16.04"
82+
dependsOn:
83+
- Test_Linux
84+
- Test_Windows
85+
- Test_MacOS
86+
steps:
87+
- script: curl -k https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN -d "payload[build_num]=$BUILD_NAME&payload[status]=done"
88+
env:
89+
COVERALLS_REPO_TOKEN: $(COVERALLS_REPO_TOKEN_SECRET)
90+
BUILD_NAME: $(Build.BuildNumber)

‎.gitignore

+42-10
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,67 @@
11
# Logs
22
logs
33
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
47

58
# Runtime data
69
pids
710
*.pid
811
*.seed
12+
*.pid.lock
913

1014
# Directory for instrumented libs generated by jscoverage/JSCover
1115
lib-cov
1216

1317
# Coverage directory used by tools like istanbul
1418
coverage
1519

20+
# nyc test coverage
21+
.nyc_output
22+
1623
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
1724
.grunt
1825

19-
# Compiled binary addons (http://nodejs.org/api/addons.html)
26+
# Bower dependency directory (https://bower.io/)
27+
bower_components
28+
29+
# node-waf configuration
30+
.lock-wscript
31+
32+
# Compiled binary addons (https://nodejs.org/api/addons.html)
2033
build/Release
2134

22-
# Dependency directory
23-
# Commenting this out is preferred by some people, see
24-
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
25-
node_modules
35+
# Dependency directories
36+
node_modules/
37+
jspm_packages/
2638

27-
# Users Environment Variables
28-
.lock-wscript
39+
# TypeScript v1 declaration files
40+
typings/
41+
42+
# Optional npm cache directory
43+
.npm
44+
45+
# Optional eslint cache
46+
.eslintcache
47+
48+
# Optional REPL history
49+
.node_repl_history
50+
51+
# Output of 'npm pack'
52+
*.tgz
53+
54+
# Yarn Integrity file
55+
.yarn-integrity
56+
57+
# dotenv environment variables file
58+
.env
59+
60+
# next.js build output
61+
.next
2962

3063
# Garbage files
3164
.DS_Store
3265

33-
# Generated by integration tests
34-
test/fixtures/tmp
35-
test/fixtures/out
66+
# Test results
67+
test.xunit

‎.jscsrc

-3
This file was deleted.

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package-lock=false

‎.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
sudo: false
22
language: node_js
33
node_js:
4+
- '12'
5+
- '10'
6+
- '8'
47
- '6'
5-
- '5'
68
- '4'
79
- '0.12'
810
- '0.10'

‎README.md

+8-19
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
# undertaker
88

9-
[![NPM version][npm-image]][npm-url] [![Downloads][downloads-image]][npm-url] [![Build Status][travis-image]][travis-url] [![AppVeyor Build Status][appveyor-image]][appveyor-url] [![Coveralls Status][coveralls-image]][coveralls-url] [![Gitter chat][gitter-image]][gitter-url]
10-
11-
Task registry that allows composition through `series`/`parallel` methods.
9+
[![NPM version][npm-image]][npm-url] [![Downloads][downloads-image]][npm-url] [![Azure Pipelines Build Status][azure-pipelines-image]][azure-pipelines-url] [![Travis Build Status][travis-image]][travis-url] [![AppVeyor Build Status][appveyor-image]][appveyor-url] [![Coveralls Status][coveralls-image]][coveralls-url] [![Gitter chat][gitter-image]][gitter-url]
1210

1311
## Usage
1412

@@ -294,30 +292,21 @@ taker.task('default', taker.series('clean', 'build', 'serve', function(cb) {
294292

295293
MIT
296294

297-
[custom-registries]: #custom-registries
298-
[async-resolution]: https://github.com/phated/async-done#completion-and-error-resolution
299-
[archy]: https://www.npmjs.org/package/archy
300-
[undertaker-registry]: https://github.com/gulpjs/undertaker-registry
301-
[undertaker-forward-reference]: https://github.com/gulpjs/undertaker-forward-reference
302-
[undertaker-task-metadata]: https://github.com/gulpjs/undertaker-task-metadata
303-
[undertaker-common-tasks]: https://github.com/gulpjs/undertaker-common-tasks
304-
[alchemist-gulp]: https://github.com/webdesserts/alchemist-gulp
305-
[gulp-hub]: https://github.com/frankwallis/gulp-hub/tree/registry-init
306-
[gulp-pipeline]: https://github.com/alienfast/gulp-pipeline
307-
[rails-registry]: https://github.com/alienfast/gulp-pipeline/blob/master/src/registry/railsRegistry.js
308-
309-
[downloads-image]: http://img.shields.io/npm/dm/undertaker.svg
295+
[downloads-image]: https://img.shields.io/npm/dm/undertaker.svg
310296
[npm-url]: https://www.npmjs.com/package/undertaker
311-
[npm-image]: http://img.shields.io/npm/v/undertaker.svg
297+
[npm-image]: https://img.shields.io/npm/v/undertaker.svg
298+
299+
[azure-pipelines-url]: https://dev.azure.com/gulpjs/gulp/_build/latest?definitionId=$PROJECT_ID&branchName=master
300+
[azure-pipelines-image]: https://dev.azure.com/gulpjs/gulp/_apis/build/status/undertaker?branchName=master
312301

313302
[travis-url]: https://travis-ci.org/gulpjs/undertaker
314-
[travis-image]: http://img.shields.io/travis/gulpjs/undertaker.svg?label=travis-ci
303+
[travis-image]: https://img.shields.io/travis/gulpjs/undertaker.svg?label=travis-ci
315304

316305
[appveyor-url]: https://ci.appveyor.com/project/gulpjs/undertaker
317306
[appveyor-image]: https://img.shields.io/appveyor/ci/gulpjs/undertaker.svg?label=appveyor
318307

319308
[coveralls-url]: https://coveralls.io/r/gulpjs/undertaker
320-
[coveralls-image]: http://img.shields.io/coveralls/gulpjs/undertaker/master.svg
309+
[coveralls-image]: https://img.shields.io/coveralls/gulpjs/undertaker/master.svg
321310

322311
[gitter-url]: https://gitter.im/gulpjs/gulp
323312
[gitter-image]: https://badges.gitter.im/gulpjs/gulp.svg

‎appveyor.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,18 @@ environment:
77
- nodejs_version: "0.10"
88
- nodejs_version: "0.12"
99
- nodejs_version: "4"
10-
- nodejs_version: "5"
1110
- nodejs_version: "6"
11+
- nodejs_version: "8"
12+
- nodejs_version: "10"
13+
- nodejs_version: "12"
14+
15+
platform:
16+
- x86
17+
- x64
1218

1319
install:
14-
- ps: Install-Product node $env:nodejs_version
20+
# https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs
21+
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:PLATFORM
1522
- npm install
1623

1724
test_script:

‎package.json

+11-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "undertaker",
33
"version": "1.2.1",
44
"description": "Task registry that allows composition through series/parallel methods.",
5-
"author": "Gulp Team <team@gulpjs.com> (http://gulpjs.com/)",
5+
"author": "Gulp Team <team@gulpjs.com> (https://gulpjs.com/)",
66
"contributors": [
77
"Blaine Bublitz <blaine.bublitz@gmail.com>",
88
"Damien Lebrun <dinoboff@hotmail.com>"
@@ -19,11 +19,11 @@
1919
"lib"
2020
],
2121
"scripts": {
22-
"lint": "eslint . && jscs index.js lib/ test/",
22+
"lint": "eslint .",
2323
"pretest": "npm run lint",
24-
"test": "mocha --async-only",
25-
"cover": "istanbul cover _mocha --report lcovonly",
26-
"coveralls": "npm run cover && istanbul-coveralls"
24+
"test": "nyc mocha --async-only",
25+
"azure-pipelines": "nyc mocha --async-only --reporter xunit -O output=test.xunit",
26+
"coveralls": "nyc report --reporter=text-lcov | coveralls"
2727
},
2828
"dependencies": {
2929
"arr-flatten": "^1.0.1",
@@ -38,16 +38,14 @@
3838
},
3939
"devDependencies": {
4040
"async-once": "^1.0.0",
41+
"coveralls": "github:phated/node-coveralls#2.x",
4142
"del": "^2.0.2",
42-
"eslint": "^1.7.3",
43-
"eslint-config-gulp": "^2.0.0",
44-
"expect": "^1.19.0",
43+
"eslint": "^2.13.1",
44+
"eslint-config-gulp": "^3.0.1",
45+
"expect": "^1.20.2",
4546
"gulp-jshint": "^1.8.4",
46-
"istanbul": "^0.4.3",
47-
"istanbul-coveralls": "^1.0.3",
48-
"jscs": "^2.3.5",
49-
"jscs-preset-gulp": "^1.0.0",
50-
"mocha": "^2.4.5",
47+
"mocha": "^3.0.0",
48+
"nyc": "^10.3.2",
5149
"once": "^1.3.1",
5250
"through2": "^2.0.0",
5351
"undertaker-common-tasks": "^1.0.0",

0 commit comments

Comments
 (0)