diff --git a/.github/workflows/dev-image.yml b/.github/workflows/dev-image.yml index 3c2cc3c..2a27412 100644 --- a/.github/workflows/dev-image.yml +++ b/.github/workflows/dev-image.yml @@ -33,5 +33,5 @@ jobs: steps: - uses: actions/checkout@v2 - run: make build - #- run: make cirun cmd="npm ci" - #- run: make ciall + - run: make cirun cmd="npm ci" + - run: make ciall diff --git a/Makefile b/Makefile index ae404e6..f69fcfa 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ IMAGE_NAME := actions_hugo_dev:latest NODE_VERSION := $(shell cat ./.nvmrc) DOCKER_BUILD := docker build . -t $(IMAGE_NAME) --build-arg NODE_VERSION=$(NODE_VERSION) DOCKER_RUN := docker run --rm -i -t -v ${PWD}:/repo -v ~/.gitconfig:/root/.gitconfig $(IMAGE_NAME) +DOCKER_RUN_CI := docker run --rm -v ${PWD}:/repo $(IMAGE_NAME) .PHONY: build @@ -14,6 +15,10 @@ build: run: $(DOCKER_RUN) $(cmd) +.PHONY: cirun +cirun: + $(DOCKER_RUN_CI) $(cmd) + .PHONY: test test: $(DOCKER_RUN) npm test @@ -21,3 +26,11 @@ test: .PHONY: commit commit: $(DOCKER_RUN) git commit -m "$(msg)" + +.PHONY: all +all: + $(DOCKER_RUN) npm run all + +.PHONY: ciall +ciall: + $(DOCKER_RUN_CI) npm run all diff --git a/package.json b/package.json index 79c8155..32eac04 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "npm": ">=6.13.7" }, "scripts": { + "all": "npm run format:check && npm run lint && npm test", "lint": "eslint ./{src,__tests__}/**/*.ts", "lint:fix": "eslint --fix ./{src,__tests__}/**/*.ts", "test": "jest --coverage --verbose", @@ -28,8 +29,7 @@ "lint-staged": { "src/**/*.ts": [ "prettier --check", - "eslint", - "jest --bail --findRelatedTests" + "eslint" ] }, "repository": {