You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by to...@apache.org on 2021/05/10 00:42:00 UTC

[apisix] branch master updated: ci: split linter (#4205)

This is an automated email from the ASF dual-hosted git repository.

tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 28ebf3e  ci: split linter (#4205)
28ebf3e is described below

commit 28ebf3e512f949812926ec58364cb3d5356c46e9
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Mon May 10 08:41:49 2021 +0800

    ci: split linter (#4205)
    
    Signed-off-by: spacewander <sp...@gmail.com>
---
 .github/workflows/{lint.yml => doc-lint.yml} | 15 ++++++---------
 .github/workflows/lint.yml                   | 26 +++++++++++++++-----------
 .github/workflows/misc-checker.yml           | 20 --------------------
 3 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/doc-lint.yml
similarity index 53%
copy from .github/workflows/lint.yml
copy to .github/workflows/doc-lint.yml
index 6356441..6c5ffd7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/doc-lint.yml
@@ -1,6 +1,10 @@
-name: ❄️ Lint
+name: Doc Lint
 
-on: [pull_request]
+on:
+  pull_request:
+    branches: [master]
+    paths:
+      - '**/*.md'
 
 jobs:
   markdownlint:
@@ -14,10 +18,3 @@ jobs:
           node-version: '12.x'
       - run: npm install -g markdownlint-cli@0.25.0
       - run: markdownlint '**/*.md'
-  trailing-whitespace:
-    name: 🌌 Trailing whitespace
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: 🧹 Check for trailing whitespace
-        run: "! git grep -EIn $'[ \t]+$' | grep -v 'received: '"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6356441..8c637e0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -3,17 +3,6 @@ name: ❄️ Lint
 on: [pull_request]
 
 jobs:
-  markdownlint:
-    name: 🍇 Markdown
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: 🚀 Use Node.js
-        uses: actions/setup-node@v2.1.5
-        with:
-          node-version: '12.x'
-      - run: npm install -g markdownlint-cli@0.25.0
-      - run: markdownlint '**/*.md'
   trailing-whitespace:
     name: 🌌 Trailing whitespace
     runs-on: ubuntu-latest
@@ -21,3 +10,18 @@ jobs:
       - uses: actions/checkout@v2
       - name: 🧹 Check for trailing whitespace
         run: "! git grep -EIn $'[ \t]+$' | grep -v 'received: '"
+  misc:
+    name: misc checker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code.
+        uses: actions/checkout@v2
+      - name: Install
+        run: |
+          wget -O - -q https://git.io/misspell | sh -s -- -b .
+      - name: Misspell
+        run: |
+          git ls-files | grep -v "docs/es" | grep -v "t/toolkit" | xargs ./misspell -error
+      - name: Merge conflict
+        run: |
+          grep "^<<<<<<< HEAD" $(git ls-files | grep -v "t/toolkit" | xargs) && exit 1 || true
diff --git a/.github/workflows/misc-checker.yml b/.github/workflows/misc-checker.yml
deleted file mode 100644
index 5082f6d..0000000
--- a/.github/workflows/misc-checker.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: misc
-on:
-  pull_request:
-    branches: [master]
-jobs:
-  misc:
-    name: misc checker
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code.
-        uses: actions/checkout@v1
-      - name: Install
-        run: |
-          wget -O - -q https://git.io/misspell | sh -s -- -b .
-      - name: Misspell
-        run: |
-          git ls-files | grep -v "docs/es" | grep -v "t/toolkit" | xargs ./misspell -error
-      - name: Merge conflict
-        run: |
-          grep "^<<<<<<< HEAD" $(git ls-files | grep -v "t/toolkit" | xargs) && exit 1 || true