Skip to content

Commit

Permalink
Merge branch 'develop' into bugfix/AY-6740_CSV-ingest-match-represent…
Browse files Browse the repository at this point in the history
…ation-data-correctly
  • Loading branch information
jakubjezek001 authored Sep 30, 2024
2 parents a796936 + 8380ad0 commit eb2c13f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 0 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/release_trigger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: 🚀 Release Trigger

on:
workflow_dispatch:

jobs:
call-release-trigger:
uses: ynput/ops-repo-automation/.github/workflows/release_trigger.yml@main
secrets:
token: ${{ secrets.YNPUT_BOT_TOKEN }}
email: ${{ secrets.CI_EMAIL }}
user: ${{ secrets.CI_USER }}
1 change: 1 addition & 0 deletions client/ayon_traypublisher/csv_publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def csvpublish(
pyblish_context = pyblish.api.Context()
pyblish_context.data["create_context"] = create_context

targets = None
# redefine targets (skip 'local' to disable validators)
if ignore_validators:
targets = ["default", "ingest"]
Expand Down
11 changes: 11 additions & 0 deletions client/ayon_traypublisher/plugins/create/create_csv_ingest.py
Original file line number Diff line number Diff line change
Expand Up @@ -788,17 +788,28 @@ def _create_instances_from_csv_data(self, csv_dir: str, filename: str):
),
None
)

slate_exists: bool = any(
repre_item.slate_exists
for repre_item in repre_items
)

is_reviewable: bool = any(
True
for repre_item in repre_items
if "review" in repre_item.tags
)

families: List[str] = ["csv_ingest"]
if slate_exists:
# adding slate to families mainly for loaders to be able
# to filter out slates
families.append("slate")

if is_reviewable:
# review family needs to be added for ExtractReview plugin
families.append("review")

instance_data = {
"name": product_item.instance_name,
"folderPath": folder_path,
Expand Down

0 comments on commit eb2c13f

Please sign in to comment.