From 123fd0870ac2eaa141d1f2e753b9382295e99b59 Mon Sep 17 00:00:00 2001 From: Devon Rueckner Date: Tue, 1 Dec 2020 10:09:51 -0800 Subject: [PATCH 1/4] reformat yaml --- .github/workflows/lint.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0644b1eec..a3902d66f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,17 +7,16 @@ jobs: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 - - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: 10.x - - uses: actions/setup-node@v1 - with: - node-version: 10.x + - uses: bahmutov/npm-install@v1 - - uses: bahmutov/npm-install@v1 + - name: Pre-generate docs + run: yarn run pregenerate - - name: Pre-generate docs - run: yarn run pregenerate - - - name: Run linter - run: yarn run lint + - name: Run linter + run: yarn run lint From 3ed05d2788e0824a25542247bb2323c121344a68 Mon Sep 17 00:00:00 2001 From: Devon Rueckner Date: Tue, 1 Dec 2020 10:10:06 -0800 Subject: [PATCH 2/4] check for modified files --- .github/workflows/lint.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a3902d66f..8e40315f2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,5 +18,14 @@ jobs: - name: Pre-generate docs run: yarn run pregenerate + - name: Check for modified files + run: | + if [[ `git status --porcelain --untracked-files=no` ]]; then + echo "Tracked files were modified by 'yarn run pregenerate'" + exit 1 + else + exit 0 + fi + - name: Run linter run: yarn run lint From e407ab9e9afd677e98100894ab1788d86ec16395 Mon Sep 17 00:00:00 2001 From: Devon Rueckner Date: Tue, 1 Dec 2020 10:11:48 -0800 Subject: [PATCH 3/4] update workflow to use more standard npm control --- .github/workflows/lint.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8e40315f2..0f4aca1f2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,7 +3,7 @@ name: Lint on: [push, pull_request] jobs: - build: + lint: runs-on: ubuntu-latest steps: @@ -13,11 +13,22 @@ jobs: with: node-version: 10.x - - uses: bahmutov/npm-install@v1 + - name: npm load cache + uses: actions/cache@v2 + with: + path: '**/node_modules' + key: ${{ runner.os }}-actions-npm-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-actions-npm- + + - run: npm install - name: Pre-generate docs run: yarn run pregenerate + - name: Run linter + run: yarn run lint + - name: Check for modified files run: | if [[ `git status --porcelain --untracked-files=no` ]]; then @@ -26,6 +37,3 @@ jobs: else exit 0 fi - - - name: Run linter - run: yarn run lint From 909e3153c1dc840580f25edd1fb1758b4a7d631d Mon Sep 17 00:00:00 2001 From: Devon Rueckner Date: Tue, 1 Dec 2020 10:17:54 -0800 Subject: [PATCH 4/4] check in modified file to fix lint error --- docs/rstIconReplacements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/rstIconReplacements.txt b/docs/rstIconReplacements.txt index 3b8dc114f..ba76590d3 100644 --- a/docs/rstIconReplacements.txt +++ b/docs/rstIconReplacements.txt @@ -11,7 +11,7 @@ .. |chevronUp| replace:: :raw-html:`` .. |classes| replace:: :raw-html:`` .. |clear| replace:: :raw-html:`` -.. |clipboard| replace:: :raw-html:`` +.. |clipboard| replace:: :raw-html:`` .. |close| replace:: :raw-html:`` .. |coachContent| replace:: :raw-html:`` .. |coach| replace:: :raw-html:``