Skip to content

Commit

Permalink
Merge pull request #14 from lifeomic/removeCircus
Browse files Browse the repository at this point in the history
Circus is now default
  • Loading branch information
David Tanner authored Feb 18, 2022
2 parents 16316c6 + 38651a4 commit 680c6fd
Show file tree
Hide file tree
Showing 5 changed files with 525 additions and 544 deletions.
20 changes: 0 additions & 20 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,3 @@ jobs:
run: yarn install
- name: Test
run: yarn test
preRelease:
needs: test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 14
registry-url: https://registry.npmjs.org
- name: Install
run: yarn install --frozen-lockfile
- name: Version
env:
PRE_ID: pr-${{ github.event.number }}-${{ github.run_id }}
run: npm version prepatch --git-tag-version=false --preid="${PRE_ID}-$(date '+%s')"
- name: PrePublish
env:
NODE_AUTH_TOKEN: ${{secrets.LIFEOMIC_NPM_TOKEN}}
PR_TAG: pr-${{ github.event.number }}
run: npm publish --tag "${PR_TAG}"
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{secrets.LIFEOMIC_NPM_TOKEN}}
run: |
npx semantic-release
run: npx semantic-release
1 change: 0 additions & 1 deletion jest-preset.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module.exports = {
transform: {
'^.+\\.tsx?$': 'ts-jest',
},
testRunner: 'jest-circus/runner',
testMatch: [
'<rootDir>/src/**/*.test.{js,jsx,ts,tsx}',
'<rootDir>/test/**/*.test.{js,jsx,ts,tsx}',
Expand Down
20 changes: 9 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,26 @@
"index.*"
],
"scripts": {
"lint": "eslint . --ext .js -f codeframe --cache",
"lint": "eslint . --cache",
"postlint": "yarn tsc",
"pretest": "yarn lint",
"test": "jest",
"test": "jest",
"prepublishOnly": "yarn tsc -p tsconfig.build.json"
},
"devDependencies": {
"@lifeomic/eslint-config-standards": "^2.1.0",
"@lifeomic/typescript-config": "^1.0.2",
"@lifeomic/eslint-config-standards": "^2.1.1",
"@lifeomic/typescript-config": "^1.0.3",
"@types/jest": "^27.4.0",
"conventional-changelog-conventionalcommits": "^4.6.0",
"eslint": "^7.32.0",
"expect": "^27.4.6",
"jest": "^27.4.7",
"jest-circus": "^27.4.6",
"eslint": "^8.9.0",
"expect": "^27.5.1",
"jest": "^27.5.1",
"semantic-release": "^17.4.4",
"ts-jest": "^27.1.2",
"typescript": "^4.5.4"
"ts-jest": "^27.1.3",
"typescript": "^4.5.5"
},
"peerDependencies": {
"jest": ">=27",
"jest-circus": ">=27",
"ts-jest": ">=27"
}
}
Loading

0 comments on commit 680c6fd

Please sign in to comment.