Skip to content

Commit

Permalink
Merge pull request #430 from openedx/bw/alpha_bump
Browse files Browse the repository at this point in the history
Bw/alpha bump
  • Loading branch information
Ben Warzeski authored Aug 7, 2023
2 parents 536bff7 + a0f24df commit efed83d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
12 changes: 11 additions & 1 deletion .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,14 @@ on:

jobs:
commitlint:
uses: openedx/.github/.github/workflows/commitlint.yml@master
runs-on: ubuntu-20.04
steps:
- name: Check out repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: remove tsconfig.json # see issue https://github.com/conventional-changelog/commitlint/issues/3256
run: |
rm tsconfig.json
- name: Check commits
uses: wagoid/commitlint-github-action@v5
3 changes: 1 addition & 2 deletions config/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const path = require('path');
const fs = require('fs');
const { jsWithTs: tsjPreset } = require('ts-jest/presets');

const presets = require('../lib/presets');

Expand Down Expand Up @@ -40,6 +39,6 @@ module.exports = {
configFile: presets.babel.resolvedFilepath,
},
],
...tsjPreset.transform,
'^.+\\.[tj]sx?$': path.resolve(__dirname, '../node_modules/.bin/ts-jest'),
},
};
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
"source-map-loader": "^4.0.1",
"ts-jest": "^26.5.0",
"style-loader": "3.3.3",
"ts-jest": "^26.5.0",
"typescript": "^4.9.4",
"url-loader": "4.1.1",
"webpack": "5.88.2",
Expand Down

0 comments on commit efed83d

Please sign in to comment.