Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
danielbayley committed Oct 15, 2020
1 parent 45ed168 commit be178c9
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
node-version: [ 10.x, 12.x, 13.x, 14.x ]
os: [ ubuntu-latest, macos-latest, windows-latest ]
os: [ ubuntu-latest, macos-latest ]

steps:
- uses: actions/checkout@v2
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ npm*
*.log

*.js
jest-preset.json
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ License
[`coffee`]: test/index.coffee
[`.md`]: test/index.coffee.md

[setup]: https://help.github.com/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages#authenticating-to-github-package-registry
[setup]: https://help.github.com/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages#authenticating-to-github-package-registry
6 changes: 0 additions & 6 deletions jest-preset.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ import package_json, {jest} from './package'#.json
coffee = FILE_EXTENSIONS.map (ext) => ext[1..]
glob = "*.@(#{coffee.join '|'})"

package_json.main = jest.preset = "./#{name}"
[staged] = Object.values package_json['lint-staged']
package_json['lint-staged'] = [glob]: staged
delete jest.rootDir
fs.writeFileSync 'package.json', JSON.stringify package_json, null, 2

if describe?
override = describe
# coffeelint: disable=no_backticks
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@
"preset": "./jest-preset"
},
"scripts": {
"prepare": "coffee --compile --bare --transpile *.coffee",
"prepare": "coffee --compile --bare --transpile jest-preset.coffee",
"precommit": "lint-staged",
"prepublishOnly": "GITHUB_ACTIONS=true npm test",
"prerelease": "git stash --include-untracked",
"release": "npm version --",
"postversion": "git push --follow-tags && npm publish && git stash pop --index",
"pretest": "npm run prepare",
"test": "npm run test.lint && npm run test.jest",
"test": "npm run test.lint && npm run test.jest --",
"test.lint": "npm run test.lint.coffee",
"test.lint.coffee": "coffeelint -- *.coffee test/*.*coffee*",
"test.jest": "jest ${GITHUB_ACTIONS+--ci --all --no-cache}",
"clean": "rm -f jest-preset.js* & jest --clearCache --config {}"
"test.jest": "jest ${GITHUB_ACTIONS+--all --ci --no-cache}",
"clean": "rm -f *.js & jest --clearCache --config {}"
}
}

0 comments on commit be178c9

Please sign in to comment.