From 5c5cbcfec414614d00ae97a09045966b1fc3a6d1 Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Fri, 7 May 2021 13:38:07 -0500
Subject: [PATCH] Merge two action into one

---
 .github/workflows/{python-ling.yaml => linting.yaml} |  5 ++++-
 .github/workflows/trailing-space.yaml                | 11 -----------
 2 files changed, 4 insertions(+), 12 deletions(-)
 rename .github/workflows/{python-ling.yaml => linting.yaml} (86%)
 delete mode 100644 .github/workflows/trailing-space.yaml

diff --git a/.github/workflows/python-ling.yaml b/.github/workflows/linting.yaml
similarity index 86%
rename from .github/workflows/python-ling.yaml
rename to .github/workflows/linting.yaml
index dcc650c..181fae4 100644
--- a/.github/workflows/python-ling.yaml
+++ b/.github/workflows/linting.yaml
@@ -8,7 +8,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
       - name: Set up Python 3.6
         uses: actions/setup-python@v2
         with:
@@ -16,6 +17,8 @@ jobs:
           python-version: '3.6'
           # Optional - x64 or x86 architecture, defaults to x64
           architecture: 'x64'
+      - name: find trailing whitespace
+        uses: harupy/find-trailing-whitespace@master
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/.github/workflows/trailing-space.yaml b/.github/workflows/trailing-space.yaml
deleted file mode 100644
index ad0efd8..0000000
--- a/.github/workflows/trailing-space.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Find trailing space
-
-on: [push, pull_request]
-
-jobs:
-  example:
-    name: Find Trailing Space
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: harupy/find-trailing-whitespace@master
-- 
GitLab