Merge branch 'main' into addon

expressobits · Sep 19, 2023 · f7be4a7 · f7be4a7
2 parents acd1f57 + 833a868
commit f7be4a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/.asset-template-addons.json.hb b/.github/workflows/.asset-template-addons.json.hb
@@ -3,7 +3,7 @@
   "description": "Modular inventory system for godot 4 with nodes, compatible with multiplayer, separate logic from the UI, Using items as separate resources.\nDemos: https://godotengine.org/asset-library/asset/1895",
   "category_id": "6",
   "godot_version": "4.1",
-  "version_string": "{{ env.steps.set_plugin_version.outputs.plugin_version }}",
+  "version_string": "{{ env.PLUGIN_VERSION }}",
   "cost": "MIT",
   "download_provider": "GitHub",
   "download_commit": "{{ env.GITHUB_SHA }}",

diff --git a/.github/workflows/push_addon_to_asset_lib.yml b/.github/workflows/push_addon_to_asset_lib.yml
@@ -9,6 +9,9 @@ on:
         default: '1.0.0'
   push:
     branches: [ addon ]
+
+env:
+  PLUGIN_VERSION: 0.0.1
 
 
 jobs:
@@ -37,6 +40,7 @@ jobs:
         VERSION=$(grep version addons/inventory-system/plugin.cfg | cut -d "=" -f 2 | tr -d '"')
         echo "plugin_version=${VERSION}"
         echo "plugin_version=${VERSION}" >> $GITHUB_OUTPUT
+        echo "PLUGIN_VERSION=${VERSION}" >> $GITHUB_ENV
 
     - name: Godot Asset Lib
       # You may pin to the exact commit or the version.
@@ -57,4 +61,4 @@ jobs:
     - name: Debug Godot Asset Lib
       run: |
         echo "plugin_version=${{ steps.set_plugin_version.outputs.plugin_version }}"
-        echo ${{ env }}
+        echo $PLUGIN_VERSION