Merge branch 'main' into addon

expressobits · Sep 19, 2023 · 044bb9c · 044bb9c
2 parents f7be4a7 + 08e210a
commit 044bb9c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/.github/workflows/.asset-template-demos.json.hb b/.github/workflows/.asset-template-demos.json.hb
@@ -3,7 +3,7 @@
   "description": "This project contains demos of the inventory-system addon: https://godotengine.org/asset-library/asset/1650",
   "category_id": "10",
   "godot_version": "4.1",
-  "version_string": "{{ needs.env-setup.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
@@ -13,18 +13,8 @@ on:
 env:
   PLUGIN_VERSION: 0.0.1
 
-
 jobs:
-#   env-setup:
-#     name: "Setup env variables"
-#     runs-on: ubuntu-latest
-#     outputs:
-#       plugin_version: ${{ steps.set_godot_version.outputs.plugin_version }}
-#     steps:
-#     - name: Checkout
-#       uses: actions/checkout@v3
 
-
   publish:
     # needs: [env-setup]
     runs-on: ubuntu-latest
@@ -38,8 +28,6 @@ jobs:
       id: set_plugin_version
       run: |
         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
@@ -58,7 +46,6 @@ jobs:
         assetTemplate: .github/workflows/.asset-template-addons.json.hb
         # Godot asset lib base url
         baseUrl: https://godotengine.org/asset-library/api
+
     - name: Debug Godot Asset Lib
-      run: |
-        echo "plugin_version=${{ steps.set_plugin_version.outputs.plugin_version }}"
-        echo $PLUGIN_VERSION
+      run: echo $PLUGIN_VERSION
diff --git a/.github/workflows/push_demos_to_asset_lib.yml b/.github/workflows/push_demos_to_asset_lib.yml
@@ -1,18 +1,35 @@
 name: "Push Demos To Asset Lib"
-on: 
+on:
+  workflow_dispatch:
+    inputs:
+      plugin_version:
+        description: 'Plugin version number:'
+        required: true
+        type: string
+        default: '1.0.0'
   push:
     branches: [ demos ]
 
+env:
+  PLUGIN_VERSION: 0.0.1
+
 jobs:
+
   publish:
+    # needs: [env-setup]
     runs-on: ubuntu-latest
-    name: Publish new version of demo to asset lib
+    name: Publish new version to asset lib
 
     steps:
-
     - name: Checkout
       uses: actions/checkout@v3
 
+    - name: set_plugin_version
+      id: set_plugin_version
+      run: |
+        VERSION=$(grep version addons/inventory-system/plugin.cfg | cut -d "=" -f 2 | tr -d '"')
+        echo "PLUGIN_VERSION=${VERSION}" >> $GITHUB_ENV
+
     - name: Godot Asset Lib
       # You may pin to the exact commit or the version.
       # uses: deep-entertainment/godot-asset-lib-action@81addbb4db62199a69e4aa5535741a8928d6abb6
@@ -24,8 +41,11 @@ jobs:
         # Godot asset lib password
         password: ${{ secrets.GODOT_ASSET_LIB_PASSWORD }}
         # ID of the asset in the asset store
-        assetId: 1895
+        assetId: 1650
         # Path to asset template file
         assetTemplate: .github/workflows/.asset-template-demos.json.hb
         # Godot asset lib base url
         baseUrl: https://godotengine.org/asset-library/api
+
+    - name: Debug Godot Asset Lib
+      run: echo $PLUGIN_VERSION