From 489d228c7311281fb904dbbc663d2fe2d8c8884f Mon Sep 17 00:00:00 2001
From: Simon Dalvai <info@simondalvai.org>
Date: Mon, 12 Aug 2024 13:17:47 +0200
Subject: [PATCH] make godot-version required and add godot-channel

---
 README.md  |  5 ++++-
 action.yml | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index e56bf38..678d050 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,10 @@ You can find the code in the `main` branch.
 | project-name | true |  | Name used in xcodebuild |
 | apple-id-username | true |   | Apple ID email |
 | apple-id-password | true |   | App specific password |
+| godot-version | true | . | Godot Engine version. Supported are 4.x versions. Check versions [here](https://github.com/godotengine/godot-builds/releases) |
+| godot-channel | false | stable | Godot Engine release channel (stable, beta, rc1, rc2, rc3...). Defaults to 'stable' Check release channels [here](https://github.com/godotengine/godot-builds/releases) |
 | working-directory | false | . | Path to .project file |
-| godot-version | false | 4.2.1 | Check versions [here](https://downloads.tuxfamily.org/godotengine/) |
+
 
 ### How to use
 Use the 4.x tag
@@ -45,6 +47,7 @@ Use the 4.x tag
   uses: dulvui/godot-ios-upload@v4
   with:
     project-name: FutsalManager
+    godot-version: 4.2.2
     provision-profile-path: ~/Library/MobileDevice/Provisioning\ Profiles/build_pp.mobileprovision
     apple-id-username: ${{ secrets.IOS_APPLE_ID_USERNAME }}
     apple-id-password: ${{ secrets.IOS_APPLE_ID_PASSWORD }}
diff --git a/action.yml b/action.yml
index 9824362..0490a4f 100644
--- a/action.yml
+++ b/action.yml
@@ -12,9 +12,12 @@ inputs:
     required: false
     default: '.'
   godot-version:
-    description: 'Godot Engine version'
+    description: 'Godot Engine version. Supported are 4.x versions'
+    required: true
+  godot-channel:
+    description: 'Godot Engine release channel (${{ inputs.godot-channel}}, beta, rc1, rc2, rc3...). Defaults to ${{ inputs.godot-channel}}'
     required: false
-    default: '4.2.2'
+    default: '${{ inputs.godot-channel}}'
   project-name:
     description: 'Project name used for xarchive building'
     required: true
@@ -50,12 +53,12 @@ runs:
       shell: bash
       if: steps.cache-godot.outputs.cache-hit != 'true'
       run: |
-        wget -q https://github.com/godotengine/godot/releases/download/${{ inputs.godot-version }}-stable/Godot_v${{ inputs.godot-version }}-stable_macos.universal.zip
-        wget -q https://github.com/godotengine/godot/releases/download/${{ inputs.godot-version }}-stable/Godot_v${{ inputs.godot-version }}-stable_export_templates.tpz
-        unzip Godot_v${{ inputs.godot-version }}-stable_macos.universal.zip
-        unzip Godot_v${{ inputs.godot-version }}-stable_export_templates.tpz
-        mkdir -p ~/Library/Application\ Support/Godot/export_templates/${{ inputs.godot-version }}.stable
-        mv templates/* ~/Library/Application\ Support/Godot/export_templates/${{ inputs.godot-version }}.stable
+        wget -q https://github.com/godotengine/godot-builds/releases/download/${{ inputs.godot-version }}-${{ inputs.godot-channel}}/Godot_v${{ inputs.godot-version }}-${{ inputs.godot-channel}}_macos.universal.zip
+        wget -q https://github.com/godotengine/godot-builds/releases/download/${{ inputs.godot-version }}-${{ inputs.godot-channel}}/Godot_v${{ inputs.godot-version }}-${{ inputs.godot-channel}}_export_templates.tpz
+        unzip Godot_v${{ inputs.godot-version }}-${{ inputs.godot-channel}}_macos.universal.zip
+        unzip Godot_v${{ inputs.godot-version }}-${{ inputs.godot-channel}}_export_templates.tpz
+        mkdir -p ~/Library/Application\ Support/Godot/export_templates/${{ inputs.godot-version }}.${{ inputs.godot-channel}}
+        mv templates/* ~/Library/Application\ Support/Godot/export_templates/${{ inputs.godot-version }}.${{ inputs.godot-channel}}
 
     - name: Install coreutils for gtimeout
       shell: bash