From 219297332ba9f0bc7d187189f184aabffc552c52 Mon Sep 17 00:00:00 2001
From: Jake Shirley <jake@xbox.com>
Date: Mon, 18 Sep 2023 11:51:18 -0700
Subject: [PATCH] How about now

---
 .../{workflow-templates => actions}/ci_xcodebuild/action.yml  | 1 +
 .github/workflows/ci_build_14.yml                             | 4 ++--
 .github/workflows/ci_build_15.yml                             | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename .github/{workflow-templates => actions}/ci_xcodebuild/action.yml (98%)

diff --git a/.github/workflow-templates/ci_xcodebuild/action.yml b/.github/actions/ci_xcodebuild/action.yml
similarity index 98%
rename from .github/workflow-templates/ci_xcodebuild/action.yml
rename to .github/actions/ci_xcodebuild/action.yml
index b5929b036..f92f0409f 100644
--- a/.github/workflow-templates/ci_xcodebuild/action.yml
+++ b/.github/actions/ci_xcodebuild/action.yml
@@ -17,6 +17,7 @@ runs:
       xcode-version: "${{ inputs.xcode_version }}"
 
   - name: "Test SDK versions"
+    shell: bash
     run: |
       xcodebuild -showsdks
 
diff --git a/.github/workflows/ci_build_14.yml b/.github/workflows/ci_build_14.yml
index 7003403d0..180b75be1 100644
--- a/.github/workflows/ci_build_14.yml
+++ b/.github/workflows/ci_build_14.yml
@@ -20,7 +20,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Build
-      uses: "./.github/workflow-templates/ci_xcodebuild"
+      uses: "./.github/actions/ci_xcodebuild"
       with:
         xcode_version: "14.3.1"
         xcodebuild_destination: "platform=iOS Simulator,name=iPhone 14,OS=16.4"
@@ -34,7 +34,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Build
-      uses: "./.github/workflow-templates/ci_xcodebuild"
+      uses: "./.github/actions/ci_xcodebuild"
       with:
         xcode_version: "14.3.1"
         xcodebuild_destination: "platform=iOS Simulator,name=iPhone 14,OS=16.4"
diff --git a/.github/workflows/ci_build_15.yml b/.github/workflows/ci_build_15.yml
index 5d8a9cf89..911d9edb9 100644
--- a/.github/workflows/ci_build_15.yml
+++ b/.github/workflows/ci_build_15.yml
@@ -20,7 +20,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Build
-      uses: "./.github/workflow-templates/ci_xcodebuild"
+      uses: "./.github/actions/ci_xcodebuild"
       with:
         xcode_version: "15.0.0"
         xcodebuild_destination: "platform=iOS Simulator,name=iPhone 14,OS=17.0"
@@ -34,7 +34,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Build
-      uses: "./.github/workflow-templates/ci_xcodebuild"
+      uses: "./.github/actions/ci_xcodebuild"
       with:
         xcode_version: "15.0.0"
         xcodebuild_destination: "platform=iOS Simulator,name=iPhone 14,OS=17.0"