Merge pull request #40 from Poing-Studios/fix_ci_3.x

Fix CI/CD on Manual Build and Release
poingstudios · Mar 5, 2023 · 07acab4 · 07acab4
2 parents beab67b + 4636302
commit 07acab4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/manual_release_ios.yml b/.github/workflows/manual_release_ios.yml
@@ -69,7 +69,13 @@ jobs:
 
     - name: Generate headers
       run: |
-        major_version=${{env.CURRENT_GODOT_VERSION%%.*}}.x
+        if [[ ${{env.CURRENT_GODOT_VERSION}} =~ ^3\..* ]]; then
+          major_version=$(echo ${{env.CURRENT_GODOT_VERSION}} | sed -E 's/^([0-9]+)\..*$/\1.x/g')
+        else
+          major_version=${{env.CURRENT_GODOT_VERSION}}
+        fi
+        
+        echo "Major version: $major_version"
         ./scripts/generate_headers.sh ${major_version} || true
 
     - name: Copy and unzip the Google Mobile Ads SDK on release binaries and iOS module folder

diff --git a/.github/workflows/release_ios_v3_3+.yml b/.github/workflows/release_ios_v3_3+.yml
@@ -91,7 +91,14 @@ jobs:
 
     - name: Generate headers
       run: |
-        ./scripts/generate_headers.sh || true
+        if [[ ${{env.CURRENT_GODOT_VERSION}} =~ ^3\..* ]]; then
+          major_version=$(echo ${{env.CURRENT_GODOT_VERSION}} | sed -E 's/^([0-9]+)\..*$/\1.x/g')
+        else
+          major_version=${{env.CURRENT_GODOT_VERSION}}
+        fi
+        
+        echo "Major version: $major_version"
+        ./scripts/generate_headers.sh ${major_version} || true
 
     - name: Download Google Mobile Ads SDK Artifact
       uses: actions/download-artifact@v2