ci: fix error if release_directory is left empty

Silverlan · Nov 25, 2023 · cb4b0ce · cb4b0ce
1 parent e605da6
commit cb4b0ce
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/build-linux-ci.yml b/.github/workflows/build-linux-ci.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Create Release Files
         shell: bash
         run: |
-          if [ -n "${{ steps.module-info.outputs.release_directory }}" ]; then
+          if [ "${{ steps.module-info.outputs.release_directory }}" != "DEFAULT" ]; then
             mkdir -p "release/${{ steps.module-info.outputs.release_directory }}"
             cp -a "${{ steps.build-module.outputs.install-dir }}/${{ steps.module-info.outputs.release_directory }}." "release/${{ steps.module-info.outputs.release_directory }}"
           else

diff --git a/.github/workflows/build-windows-ci.yml b/.github/workflows/build-windows-ci.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Create Release Files
         shell: bash
         run: |
-          if [ -n "${{ steps.module-info.outputs.release_directory }}" ]; then
+          if [ "${{ steps.module-info.outputs.release_directory }}" != "DEFAULT" ]; then
             mkdir -p "release/${{ steps.module-info.outputs.release_directory }}"
             cp -a "${{ steps.build-module.outputs.install-dir }}/${{ steps.module-info.outputs.release_directory }}." "release/${{ steps.module-info.outputs.release_directory }}"
           else

diff --git a/.github/workflows/init.yml b/.github/workflows/init.yml
@@ -27,6 +27,7 @@ jobs:
         if: steps.template_exists.outputs.files_exists == 'true'
         run: npx tmplr && rm -fr .tmplr.yml && rm -fr .github/workflows/init.yml
         env:
+          # Note: The values must not be an empty string, due to a bug in the tmplr module
           name: ${{ steps.module-info.outputs.name }}
           module_name: ${{ steps.module-info.outputs.module_name }}
           install_directory: ${{ steps.module-info.outputs.install_directory }}

diff --git a/github_actions/get_module_info/action.yml b/github_actions/get_module_info/action.yml
@@ -44,6 +44,10 @@ runs:
         module_name=$( getVal '.module_name' )
         install_directory=$( getVal '.install_directory' )
         release_directory=$( getVal '.release_directory' )
+        if [ -z "$release_directory" ]; then
+            # If release_directory is empty, assign the default value "DEFAULT"
+            release_directory="DEFAULT"
+        fi
 
         echo "name=$name" >> $GITHUB_OUTPUT
         echo "module_name=$module_name" >> $GITHUB_OUTPUT