Skip to content

Commit

Permalink
Merge pull request #42 from MinoruSekine/fix/41/slow_make_lint_site
Browse files Browse the repository at this point in the history
fix: Slow make lint and make site. (#41)
  • Loading branch information
MinoruSekine authored Jul 22, 2024
2 parents 19464c4 + df238b7 commit 7789a2c
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 33 deletions.
26 changes: 17 additions & 9 deletions .github/workflows/Deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,25 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Checkout
uses: actions/checkout@v4

- name: Build site
run: |
make site
- name: Set up node
uses: actions/setup-node@v4
with:
node-version: 18

- name: Upload artifact
uses: actions/[email protected]
with:
path: ./out/site
- name: Install jsdoc
run: npm install

- name: Build site
run: |
make site
- name: Upload artifact
uses: actions/[email protected]
with:
path: ./out/site

deploy:
needs: upload_artifact
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/HTML5Validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Check out
uses: actions/checkout@v4
- name: Check out
uses: actions/checkout@v4

- name: Validate HTML5
uses: Cyb3r-Jak3/[email protected]
with:
root: ./
- name: Validate HTML5
uses: Cyb3r-Jak3/[email protected]
with:
root: ./
18 changes: 13 additions & 5 deletions .github/workflows/MakeSiteTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Checkout
uses: actions/checkout@v4

- name: Build site
run: |
make -j site
- name: Set up node
uses: actions/setup-node@v4
with:
node-version: 18

- name: Install jsdoc
run: npm install

- name: Build site
run: |
make -j site
23 changes: 13 additions & 10 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,19 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Check out
uses: actions/checkout@v4
- name: Check out
uses: actions/checkout@v4

- name: Set up node
uses: actions/setup-node@v4
with:
node-version: 18
- name: Set up node
uses: actions/setup-node@v4
with:
node-version: 18

- name: ESLint
run: make -j eslint
- name: Install linters
run: npm install

- name: stylelint
run: make -j stylelint
- name: ESLint
run: make -j eslint

- name: stylelint
run: make -j stylelint
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,16 @@ $(SITE_OUT_JSDOC_DIR): $(SITE_OUT_DIR)
mkdir -p $@

$(SITE_OUT_JSDOC_HTML): $(SITE_OUT_JSDOC_DIR) $(SRC_JS)
npm install
npm run doc

site-jsdoc: $(SITE_OUT_JSDOC_HTML)

lint: eslint stylelint

eslint:
npm install
npm run eslint

stylelint:
npm install
npm run stylelint

.PHONY: all clean clean-out clean-site site site-jsdoc lint eslint stylelint

0 comments on commit 7789a2c

Please sign in to comment.