From 857ea5521ff7f6603e645b055f7fb3454403739c Mon Sep 17 00:00:00 2001
From: Jason Garber <jason.garber@cargosense.com>
Date: Wed, 28 Feb 2024 11:21:36 -0500
Subject: [PATCH] Additional workflows tidying

---
 .github/workflows/lint.yml    | 22 ++++++++++++----------
 .github/workflows/release.yml |  7 +++++--
 .github/workflows/test.yml    | 10 ++++------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1c38c73..d4eed24 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -6,18 +6,20 @@ on:
   workflow_dispatch:
 
 jobs:
-  lint-shell-scripts:
+  lint:
+    name: Lint shell scripts
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: azohra/shell-linter@latest
-      with:
-        path: "./src/**/*.sh"
-        severity: "warning"
-      env:
-        # Acceptable use of decimal comparison
-        SHELLCHECK_OPTS: -e SC2072
-  validate-feature-json:
+      - uses: actions/checkout@v4
+      - uses: azohra/shell-linter@latest
+        with:
+          path: "./src/**/*.sh"
+          severity: "warning"
+        env:
+          # Acceptable use of decimal comparison
+          SHELLCHECK_OPTS: -e SC2072
+  validate:
+    name: Validate devcontainer-feature.json files
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d7b097a..b16143f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,18 +7,21 @@ on:
 
 jobs:
   lint:
+    name: Lint
     uses: "./.github/workflows/lint.yml"
   test:
+    name: Test
     uses: "./.github/workflows/test.yml"
   publish-to-github-packages:
-    if: ${{ github.ref == 'refs/heads/main' }}
-    runs-on: ubuntu-latest
+    name: Publish to GitHub Packages
     permissions:
       contents: read
       packages: write
     needs:
       - lint
       - test
+    if: ${{ github.ref == 'refs/heads/main' }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: devcontainers/action@v1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6f16ead..e186cdf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,16 +9,15 @@ jobs:
   test-autogenerated:
     name: Feature ${{ matrix.features }} » ${{ matrix.baseImage }}
     runs-on: ubuntu-latest
-    continue-on-error: true
     strategy:
       matrix:
         features:
-          - color
-          - hello
+          - actionlint
         baseImage:
           - debian:latest
           - ubuntu:latest
           - mcr.microsoft.com/devcontainers/base:ubuntu
+    continue-on-error: true
     steps:
       - uses: actions/checkout@v4
       - run: npm install -g @devcontainers/cli
@@ -26,12 +25,11 @@ jobs:
   test-scenarios:
     name: Feature ${{ matrix.features }}
     runs-on: ubuntu-latest
-    continue-on-error: true
     strategy:
       matrix:
         features:
-          - color
-          - hello
+          - actionlint
+    continue-on-error: true
     steps:
       - uses: actions/checkout@v4
       - run: npm install -g @devcontainers/cli