From 1678006363e84a3641e9cf1ff1e9bf918c20db83 Mon Sep 17 00:00:00 2001
From: Josh Spicer <josh@joshspicer.com>
Date: Thu, 26 May 2022 02:09:32 +0000
Subject: [PATCH] ruby before jekyll and format workflows

---
 .github/workflows/test-all.yaml    | 67 +++++++++++++++---------------
 .github/workflows/test-manual.yaml | 18 ++++----
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index 3744e22..ee4d50b 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -1,8 +1,8 @@
 name: "Test Features (CI)"
-on: 
+on:
   push:
     branches:
-    - main
+      - main
   workflow_dispatch:
 
 jobs:
@@ -10,38 +10,39 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     strategy:
-          matrix:
-            features: [ 
-              "anaconda", 
-              "aws-cli", 
-              "azure-cli", 
-              "common", 
-              "desktop-lite", 
-              "docker-from-docker",
-              "docker-in-docker", 
-              "dotnet", 
-              "git", 
-              "git-lfs", 
-              "github-cli", 
-              "go", 
-              "java gradle",        # Install 'java', then 'gradle'
-              "hugo",
-              "java",
-              "jekyll",
-              "python jupyterlab",  # Install 'python', then 'jupyterlab'
-              "kubectl-helm-minikube", 
-              "maven", 
-              "node", 
-              "php",
-              "powershell", 
-              "python", 
-              "ruby", 
-              "rust", 
-              "sshd", 
-              "terraform" ]
-            baseImage: [ "ubuntu:focal" ]
+      matrix:
+        features: [
+            "anaconda",
+            "aws-cli",
+            "azure-cli",
+            "common",
+            "desktop-lite",
+            "docker-from-docker",
+            "docker-in-docker",
+            "dotnet",
+            "git",
+            "git-lfs",
+            "github-cli",
+            "go",
+            "java gradle",        # Install 'java', then 'gradle'
+            "hugo",
+            "java",
+            "ruby jekyll",        # Install 'ruby', then 'jekyll'
+            "python jupyterlab",  # Install 'python', then 'jupyterlab'
+            "kubectl-helm-minikube",
+            "maven",
+            "node",
+            "php",
+            "powershell",
+            "python",
+            "ruby",
+            "rust",
+            "sshd",
+            "terraform",
+          ]
+        baseImage: ["ubuntu:focal"]
     steps:
       - uses: actions/checkout@v2
 
       - name: " Testing '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
-        run: npx --yes ./devcontainers-cli-0.3.0.tgz features test -f ${{ matrix.features }} -i ${{ matrix.baseImage }} -c `pwd` 
+        run: npx --yes ./devcontainers-cli-0.3.0.tgz features test -f ${{ matrix.features }} -i ${{ matrix.baseImage }} -c `pwd`
diff --git a/.github/workflows/test-manual.yaml b/.github/workflows/test-manual.yaml
index d5714c7..d532ade 100644
--- a/.github/workflows/test-manual.yaml
+++ b/.github/workflows/test-manual.yaml
@@ -1,19 +1,19 @@
 name: "Test Features (Manual)"
-on: 
+on:
   workflow_dispatch:
     inputs:
       features:
-        description: 'list of features to execute tests against'     
+        description: "list of features to execute tests against"
         required: true
-        default: 'go dotnet'
-      baseImage: 
-        description: 'Base image'     
+        default: "go dotnet"
+      baseImage:
+        description: "Base image"
         required: true
-        default: 'ubuntu:focal'
+        default: "ubuntu:focal"
       logLevel:
-        description: 'Log Level (info/debug/trace)'
+        description: "Log Level (info/debug/trace)"
         required: true
-        default: 'info'
+        default: "info"
 
 jobs:
   test:
@@ -22,4 +22,4 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: " Testing '${{ github.event.inputs.features }}' against '${{ github.event.inputs.baseImage }}'"
-        run: npx --yes ./devcontainers-cli-0.3.0.tgz features test --features ${{ github.event.inputs.features }} --base-image ${{ github.event.inputs.baseImage }} --collection-folder `pwd` --log-level ${{ github.event.inputs.logLevel }} 
+        run: npx --yes ./devcontainers-cli-0.3.0.tgz features test --features ${{ github.event.inputs.features }} --base-image ${{ github.event.inputs.baseImage }} --collection-folder `pwd` --log-level ${{ github.event.inputs.logLevel }}