Skip to content

Commit 857b076

Browse files
committed
Rename addon_base_id to asset_base_id in the addon testing scripts, add few tweaks
1 parent a05117f commit 857b076

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/webhook_test_addon.yml renamed to .github/workflows/webhook_process_addon.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: Test Addon
2-
run-name: Test addon | ${{ github.event.inputs.addon_base_id || github.event.client_payload.addon_base_id }} | ${{ github.event.inputs.verification_status || github.event.client_payload.verification_status }} | ${{ github.event.inputs.is_private || github.event.client_payload.is_private }}
1+
name: Process Addon
2+
run-name: Process Add-on | ${{ github.event.inputs.asset_base_id || github.event.client_payload.asset_base_id }} | ${{ github.event.inputs.verification_status || github.event.client_payload.verification_status }} | ${{ github.event.inputs.is_private || github.event.client_payload.is_private }}
33

44
on:
55
workflow_dispatch:
66
inputs:
7-
addon_base_id:
7+
asset_base_id:
88
description: 'Addon Base ID'
99
required: true
1010
verification_status:
@@ -20,7 +20,7 @@ env:
2020
BLENDERKIT_API_KEY: '${{ secrets.BLENDERKIT_API_KEY }}'
2121
TEXTYBOT_API_KEY: '${{ secrets.TEXTYBOT_API_KEY }}' # for commenting
2222
BLENDER_PATH: /home/headless/blender/blender
23-
ADDON_BASE_ID: ${{ github.event.inputs.addon_base_id || github.event.client_payload.addon_base_id }}
23+
ASSET_BASE_ID: ${{ github.event.inputs.asset_base_id || github.event.client_payload.asset_base_id }}
2424

2525
jobs:
2626
test_matrix:

test_addon.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ def blender_validate_extension():
6060
if __name__ == '__main__':
6161
BLENDER_PATH = os.environ.get('BLENDER_PATH','')
6262
API_KEY = os.environ.get('BLENDERKIT_API_KEY', '')
63-
ADDON_BASE_ID = os.environ.get('ADDON_BASE_ID', '')
63+
ASSET_BASE_ID = os.environ.get('ASSET_BASE_ID', '')
6464

65-
params = {'asset_base_id': ADDON_BASE_ID, 'asset_type': 'addon'}
65+
params = {'asset_base_id': ASSET_BASE_ID, 'asset_type': 'addon'}
6666
addons = search.get_search_without_bullshit(params, api_key=API_KEY)
6767
if len(addons) == 0:
6868
raise Exception("Addon not found in the database")
6969

7070
for i, asset in enumerate(addons): # One result is expected, but for transparency..
71-
print(f"{i+1}. {asset['assetType']}: {asset['name']}")
71+
print(f"{i+1}. {asset['assetType']}: {asset['name']} ({asset['url']})")
7272

7373
# We just take 1st result
7474
test_ok, test_results = test_addon(addons[0], API_KEY, binary_path=BLENDER_PATH)

test_addon_report.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ def generate_comment(results: OrderedDict[str, dict]) -> str:
5656

5757
api_nice.create_comment(
5858
comment=comment,
59-
asset_base_id=environ.get('ADDON_BASE_ID', ''),
59+
asset_base_id=environ.get('ASSET_BASE_ID', ''),
6060
api_key=environ.get('TEXTYBOT_API_KEY', environ.get('BLENDERKIT_API_KEY', '')), # prefer KEY for account of specialized commenting bot
6161
server_url=environ.get('BLENDERKIT_SERVER', '')
6262
)
63+
print(f"comment uploaded")

0 commit comments

Comments
 (0)