From 374ca93c1e36e07789e3202ef76dd43eb38fe4a8 Mon Sep 17 00:00:00 2001
From: soup-bowl <code@soupbowl.io>
Date: Wed, 2 Oct 2024 17:44:26 +0100
Subject: [PATCH] Removed JSON step from actions.

---
 .github/workflows/build-beta.yml | 30 ++++++++++++++++++++----------
 .github/workflows/build-main.yml | 29 +++++++++++++++++++----------
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml
index d73c452..1dbd2b7 100644
--- a/.github/workflows/build-beta.yml
+++ b/.github/workflows/build-beta.yml
@@ -15,10 +15,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tag:
-            - '{ "tag": "alpine-beta", "folder": "beta/alpine", "file": "Dockerfile", "platforms": "linux/amd64,linux/arm64" }'
-            - '{ "tag": "source", "folder": "beta/source", "file": "Dockerfile", "platforms": "linux/amd64" }'
-            - '{ "tag": "dotnet6", "folder": "beta/source", "file": "Dockerfile.dotnet6", "platforms": "linux/amd64,linux/arm64" }'
+        include:
+          - tag: alpine-beta
+            folder: beta/alpine
+            file: Dockerfile
+            platforms: linux/amd64,linux/arm64
+          - tag: source
+            folder: beta/source
+            file: Dockerfile
+            platforms: linux/amd64
+          - tag: dotnet6
+            folder: beta/source
+            file: Dockerfile.dotnet6
+            platforms: linux/amd64,linux/arm64
+
     steps:
       - name: Checkout Codebase
         uses: actions/checkout@v4
@@ -44,15 +54,15 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build Container
-        #if: github.event_name != 'schedule' || fromJSON(matrix.tag).tag == 'source'
+        #if: github.event_name != 'schedule' || matrix.tag == 'source'
         uses: docker/build-push-action@v5
         with:
           push: true
-          context: "{{defaultContext}}:${{ fromJSON(matrix.tag).folder }}"
+          context: "{{defaultContext}}:${{ matrix.folder }}"
           tags: >
-            soupbowl/opensimulator:${{ fromJSON(matrix.tag).tag }},
-            ghcr.io/soup-bowl/opensimulator-docker:${{ fromJSON(matrix.tag).tag }},
-          platforms: ${{ fromJSON(matrix.tag).platforms }}
-          file: "${{ fromJSON(matrix.tag).file }}"
+            soupbowl/opensimulator:${{ matrix.tag }},
+            ghcr.io/soup-bowl/opensimulator-docker:${{ matrix.tag }},
+          platforms: ${{ matrix.platforms }}
+          file: "${{ matrix.file }}"
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
index 35ea46c..fc77375 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build-main.yml
@@ -13,11 +13,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tag:
-            - '{ "tag": "0.9.2.0", "folder": "build/latest", "platforms": "linux/amd64,linux/arm64" }'
-            - '{ "tag": "0.9.2.1", "folder": "build/latest", "platforms": "linux/amd64,linux/arm64" }'
-            - '{ "tag": "0.9.2.2", "folder": "build/latest", "platforms": "linux/amd64,linux/arm64" }'
-            - '{ "tag": "latest", "folder": "build/latest", "platforms": "linux/amd64,linux/arm64" }'
+        include:
+          - tag: "0.9.2.0"
+            folder: build/latest
+            platforms: linux/amd64,linux/arm64
+          - tag: "0.9.2.1"
+            folder: build/latest
+            platforms: linux/amd64,linux/arm64
+          - tag: "0.9.2.2"
+            folder: build/latest
+            platforms: linux/amd64,linux/arm64
+          - tag: "latest"
+            folder: build/latest
+            platforms: linux/amd64,linux/arm64
+
     steps:
       - name: Checkout Codebase
         uses: actions/checkout@v4
@@ -46,12 +55,12 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: true
-          context: "{{defaultContext}}:${{ fromJSON(matrix.tag).folder }}"
+          context: "{{defaultContext}}:${{ matrix.folder }}"
           tags: >
-            soupbowl/opensimulator:${{ fromJSON(matrix.tag).tag }},
-            ghcr.io/soup-bowl/opensimulator-docker:${{ fromJSON(matrix.tag).tag }},
-          platforms: ${{ fromJSON(matrix.tag).platforms }}
+            soupbowl/opensimulator:${{ matrix.tag }},
+            ghcr.io/soup-bowl/opensimulator-docker:${{ matrix.tag }},
+          platforms: ${{ matrix.platforms }}
           build-args: |
-            OPENSIM_VERSION=${{ fromJSON(matrix.tag).tag }}
+            OPENSIM_VERSION=${{ matrix.tag }}
           cache-from: type=gha
           cache-to: type=gha,mode=max