Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolo-ribaudo committed Apr 22, 2024
1 parent 229da63 commit 7641357
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ jobs:
- name: Extract artifacts
run: tar -xf babel-artifact.tar; rm babel-artifact.tar
- name: Lint
run: make -j prepublish-prepare-dts lint-ci
run: make -j lint-ci
- name: Ensure cwd does not contain uncommitted changes
run: |
node ./scripts/assert-dir-git-clean.js "prepublish-prepare-dts lint-ci"
node ./scripts/assert-dir-git-clean.js "lint-ci"
test:
name: Test on Node.js # GitHub will add ${{ matrix.node-version }} to this title
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
BABEL_8_BREAKING: true
STRIP_BABEL_8_FLAG: true
- name: Lint
run: make -j tscheck lint-ci
run: make -j lint-ci
env:
BABEL_ENV: test
BABEL_8_BREAKING: true
Expand Down
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,10 @@ code-quality: lint
tscheck:
$(MAKEJS) tscheck

tscheck-slow:
$(MAKEJS) tscheck-slow

clean-ts:
$(MAKEJS) clean-ts

lint-ci: lint check-compat-data
lint-ci: lint-ci check-compat-data

generate-readme:
$(NODE) scripts/generators/readmes.js
Expand All @@ -93,7 +90,7 @@ test: lint test-only
clone-license:
$(MAKEJS) clone-license

prepublish-prepare-dts:
prepublish-prepare-dts: tscheck
$(MAKEJS) prepublish-prepare-dts

prepublish-build:
Expand Down
4 changes: 2 additions & 2 deletions Makefile.js

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions Makefile.source.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,11 @@ target["prepublish-build-standalone"] = function () {
target["prepublish-prepare-dts"] = function () {
target["clean-ts"]();
target["tscheck"]();
target["prepublish-prepare-dts-no-clean"]();
};

target["prepublish-prepare-dts-no-clean"] = function () {
yarn(["gulp", "bundle-dts"]);

target["build-typescript-legacy-typings"]();
};

Expand All @@ -298,11 +300,6 @@ target["tscheck"] = function () {
node(["scripts/parallel-tsc/tsc.js", "."]);
};

target["tscheck-slow"] = function () {
target["generate-tsconfig"]();
yarn(["tsc", "-b", "."]);
};

target["clean-ts"] = function () {
// ts doesn't generate declaration files after we remove the output directory manually when incremental==true
shell.rm("-rf", "tsconfig.tsbuildinfo");
Expand Down Expand Up @@ -377,6 +374,12 @@ target["lint"] = function () {
eslint();
};

target["lint-ci"] = function () {
target["tscheck"]();
eslint();
target["prepublish-prepare-dts-no-clean"]();
};

target["fix"] = function () {
target["fix-json"]();
target["fix-js"]();
Expand Down

0 comments on commit 7641357

Please sign in to comment.