Merge pull request #24 from jidicula/dev

Combine shell CI into 1 workflow

.github/workflows/shfmt.yml → .github/workflows/shell-lint.yml

@@ -1,4 +1,4 @@
-name: shfmt
+name: shell-lint
 
 on:
   push:
@@ -7,17 +7,28 @@ on:
       - dev
     paths:
       - '**.sh'
-      - '.github/workflows/shfmt.yml'
+      - '.github/workflows/shell-lint.yml'
   pull_request:
     branches:
       - main
       - dev
     paths:
       - '**.sh'
-      - '.github/workflows/shfmt.yml'
+      - '.github/workflows/shell-lint.yml'
 
 jobs:
-  format:
+  shellcheck:
+    name: Run Shellcheck on shellscripts
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: ludeeus/action-shellcheck@1.0.0
+
+  shfmt:
+    name: Check shellscript formatting
+    needs: shellcheck
     env:
       SHFMT_VERSION: 3.0.1
     runs-on: ubuntu-20.04

README.md

@@ -1,8 +1,7 @@
-| Tag    | Docker Image CI | shellcheck | shfmt |
-|--------|-----------------|------------|-------|
-| `v2.0.1` | ![Docker Image CI](https://github.com/jidicula/clang-format-action/workflows/Docker%20Image%20CI/badge.svg?branch=v2.0.1) | ![shellcheck](https://github.com/jidicula/clang-format-action/workflows/shellcheck/badge.svg?branch=v2.0.1) | ![shfmt](https://github.com/jidicula/clang-format-action/workflows/shfmt/badge.svg?branch=v2.0.1) |
-| `main`   | ![Docker Image CI](https://github.com/jidicula/clang-format-action/workflows/Docker%20Image%20CI/badge.svg?branch=main) | ![shellcheck](https://github.com/jidicula/clang-format-action/workflows/shellcheck/badge.svg?branch=main) | ![shfmt](https://github.com/jidicula/clang-format-action/workflows/shfmt/badge.svg?branch=main) |
-| `dev`    | ![Docker Image CI](https://github.com/jidicula/clang-format-action/workflows/Docker%20Image%20CI/badge.svg?branch=dev) | ![shellcheck](https://github.com/jidicula/clang-format-action/workflows/shellcheck/badge.svg?branch=dev) | ![shfmt](https://github.com/jidicula/clang-format-action/workflows/shfmt/badge.svg?branch=dev) |
+| Branch | Docker Image CI | shell-lint |
+|--------|-----------------|------------|
+| `main`   | ![Docker Image CI](https://github.com/jidicula/clang-format-action/workflows/Docker%20Image%20CI/badge.svg?branch=main) | ![shell-lint](https://github.com/jidicula/clang-format-action/workflows/shell-lint/badge.svg?branch=main) |
+| `dev`    | ![Docker Image CI](https://github.com/jidicula/clang-format-action/workflows/Docker%20Image%20CI/badge.svg?branch=dev) | ![shell-lint](https://github.com/jidicula/clang-format-action/workflows/shell-lint/badge.svg?branch=dev) |
 
 # clang-format-action
 GitHub Action for clang-format