Skip to content

Commit 8d228e0

Browse files
gplstephToolkittymathurf
authored
8724 GitHub releases (#3)
Allowed bootstrap hook to accept git or github descriptor. Updated from TK basic v1.4.5. Uses tk-framework-unrealqt from ue4plugins repo. * Updated tk-multi-publish2 to v2.6.2 Release notes: https://github.com/shotgunsoftware/tk-multi-publish2/wiki/Release-Notes#v262 * Updated tk-desktop to v2.6.3 Release notes: https://github.com/shotgunsoftware/tk-desktop/wiki/Release-Notes#v263 * Updated tk-framework-qtwidgets to v2.10.3 Release notes: https://github.com/shotgunsoftware/tk-framework-qtwidgets/wiki/Release-Notes#v2103 * Updated tk-multi-launchapp to v0.12.2 Release notes: https://github.com/shotgunsoftware/tk-multi-launchapp/wiki/Release-Notes#v0122 * Updated tk-photoshopcc to v1.9.2 Release notes: https://github.com/shotgunsoftware/tk-photoshopcc/wiki/Release-Notes#v192 * Updated tk-aftereffects to v0.3.2 Release notes: https://github.com/shotgunsoftware/tk-aftereffects/wiki/Release-Notes#v032 * Updated tk-multi-about to v0.4.2 Release notes: https://github.com/shotgunsoftware/tk-multi-about/wiki/Release-Notes#v042 * Updated tk-shotgun to v0.10.2 Release notes: https://github.com/shotgunsoftware/tk-shotgun/wiki/Release-Notes#v0102 * Updated tk-multi-loader2 to v1.21.2 Release notes: https://github.com/shotgunsoftware/tk-multi-loader2/wiki/Release-Notes#v1212 * Updated tk-framework-shotgunutils to v5.8.5 Release notes: https://github.com/shotgunsoftware/tk-framework-shotgunutils/wiki/Release-Notes#v585 * Updated tk-shell to v0.9.2 Release notes: https://github.com/shotgunsoftware/tk-shell/wiki/Release-Notes#v092 * Updated tk-framework-desktopclient to v0.3.2 Release notes: https://github.com/shotgunsoftware/tk-framework-desktopclient/wiki/Release-Notes#v032 * Updated tk-multi-shotgunpanel to v1.8.2 Release notes: https://github.com/shotgunsoftware/tk-multi-shotgunpanel/wiki/Release-Notes#v182 * Updated tk-core to v0.20.12 Release notes: https://github.com/shotgunsoftware/tk-core/wiki/Release-Notes#v02012 * Updated tk-nuke to v0.14.4 Release notes: https://github.com/shotgunsoftware/tk-nuke/wiki/Release-Notes#v0144 * Updated tk-3dsmaxplus to v0.6.2 * Updated tk-maya to v0.11.3 Release notes: https://github.com/shotgunsoftware/tk-maya/wiki/Release-Notes#v0113 * Updated tk-3dsmax to v1.2.3 Release notes: https://github.com/shotgunsoftware/tk-3dsmax/wiki/Release-Notes#v123 * Updated tk-framework-adminui to v0.7.2 Release notes: https://github.com/shotgunsoftware/tk-framework-adminui/wiki/Release-Notes#v072 * Updated tk-houdini to v1.8.3 Release notes: https://github.com/shotgunsoftware/tk-houdini/wiki/Release-Notes#v183 * Updated tk-framework-adobe to v1.1.5 Release notes: https://github.com/shotgunsoftware/tk-framework-adobe/wiki/Release-Notes#v115 * Updated tk-shotgun-launchvredreview to v1.1.3 Release notes: https://github.com/shotgunsoftware/tk-shotgun-launchvredreview/wiki/Release-Notes#v113 * Updated tk-framework-aliastranslations to v0.2.2 Release notes: https://github.com/shotgunsoftware/tk-framework-aliastranslations/wiki/Release-Notes#v022 * Updated tk-vred to v2.1.4 Release notes: https://github.com/shotgunsoftware/tk-vred/wiki/Release-Notes#v214 * Updated tk-alias to v2.1.4 Release notes: https://github.com/shotgunsoftware/tk-alias/wiki/Release-Notes#v214 * Updated tk-framework-lmv to v0.2.2 Release notes: https://github.com/shotgunsoftware/tk-framework-lmv/wiki/Release-Notes#v022 * Updated tk-flame to v1.17.3 Release notes: https://github.com/shotgunsoftware/tk-flame/wiki/Release-Notes#v1173 * Updated tk-3dsmax to v1.2.4 Release notes: https://github.com/shotgunsoftware/tk-3dsmax/wiki/Release-Notes#v124 * Updated tk-maya to v0.11.4 Release notes: https://github.com/shotgunsoftware/tk-maya/wiki/Release-Notes#v0114 * Updated tk-framework-desktopserver to v1.5.3 Release notes: https://github.com/shotgunsoftware/tk-framework-desktopserver/wiki/Release-Notes#v153 * Updated tk-alias to v2.1.5 Release notes: https://github.com/shotgunsoftware/tk-alias/wiki/Release-Notes#v215 * For #8724, wip * For #8724, fixed repo * For #8724, UE repo * For #8724, fixed UE release Co-authored-by: Toolkitty <toolkitty@shotgunsoftware.com> Co-authored-by: mathurf <francis.mathurin@autodesk.com>
1 parent 3403d70 commit 8d228e0

6 files changed

Lines changed: 51 additions & 44 deletions

File tree

core/core_api.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
location:
1515
type: app_store
1616
name: tk-core
17-
version: v0.20.11
17+
version: v0.20.12

core/hooks/bootstrap.py

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ def can_cache_bundle(self, descriptor):
5454
:raises RuntimeError: If six.moves is not available.
5555
"""
5656
descd = descriptor.get_dict()
57-
# Some descriptors like shotgun descriptors don't have a path: ignore
58-
# them.
59-
if not descd.get("path"):
60-
return False
61-
return bool(self._should_download_release(descd["path"]))
57+
return bool(self._should_download_release(descd))
6258

6359
def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):
6460
"""
@@ -92,7 +88,7 @@ def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):
9288
descd = descriptor.get_dict()
9389
version = descriptor.version
9490
self.logger.info("Treating %s" % descd)
95-
specs = self._should_download_release(descd["path"])
91+
specs = self._should_download_release(descd)
9692
if not specs:
9793
raise RuntimeError("Don't know how to download %s" % descd)
9894
name = specs[0]
@@ -171,17 +167,28 @@ def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):
171167
self.logger.exception(e)
172168
raise
173169

174-
def _should_download_release(self, desc_path):
170+
def _should_download_release(self, desc):
175171
"""
176-
Return a repo name and a token if the given descriptor path should be downloaded
172+
Return a repo name and a token if the given descriptor should be downloaded
177173
from a github release.
178174
179-
:param str desc_path: A Toolkit descriptor path.
175+
:param str desc: A Toolkit descriptor.
180176
:returns: A name, token tuple or ``None``.
181177
"""
182-
for name, token in self._download_release_from_github:
183-
if "git@github.com:%s.git" % name == desc_path:
184-
return name, token
178+
if desc["type"] == "github_release":
179+
# Let's be safe...
180+
if not desc.get("organization") or not desc.get("repository"):
181+
return None
182+
desc_path = "%s/%s" % (desc["organization"], desc["repository"])
183+
for name, token in self._download_release_from_github:
184+
if name == desc_path:
185+
return name, token
186+
elif desc.get("path"):
187+
# Check the path for a git descriptor
188+
desc_path = desc["path"]
189+
for name, token in self._download_release_from_github:
190+
if "git@github.com:%s.git" % name == desc_path:
191+
return name, token
185192
return None
186193

187194
def _download_zip_github_asset(self, asset, destination, token):

env/includes/common/apps.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ includes:
1919

2020
common.apps.tk-multi-about:
2121
location:
22-
version: v0.4.1
22+
version: v0.4.2
2323
type: app_store
2424
name: tk-multi-about
2525
common.apps.tk-multi-pythonconsole:
@@ -35,19 +35,19 @@ common.apps.tk-multi-setframerange:
3535
common.apps.tk-multi-publish2.location:
3636
type: app_store
3737
name: tk-multi-publish2
38-
version: v2.6.1
38+
version: v2.6.2
3939
common.apps.tk-multi-loader2.location:
4040
type: app_store
4141
name: tk-multi-loader2
42-
version: v1.21.1
42+
version: v1.21.2
4343
common.apps.tk-multi-shotgunpanel.location:
4444
type: app_store
4545
name: tk-multi-shotgunpanel
46-
version: v1.8.1
46+
version: v1.8.2
4747
common.apps.tk-multi-launchapp.location:
4848
type: app_store
4949
name: tk-multi-launchapp
50-
version: v0.12.1
50+
version: v0.12.2
5151
common.apps.tk-multi-reviewsubmission.location:
5252
type: app_store
5353
name: tk-multi-reviewsubmission
@@ -67,5 +67,5 @@ common.apps.tk-shotgun-launchfolder.location:
6767
common.apps.tk-shotgun-launchvredreview.location:
6868
type: app_store
6969
name: tk-shotgun-launchvredreview
70-
version: v1.1.2
70+
version: v1.1.3
7171
common.apps.tk-multi-publish2.help_url: https://help.autodesk.com/view/SGSUB/ENU/?guid=SG_Supervisor_Artist_sa_integrations_sa_integrations_user_guide_html#the-publisher

env/includes/common/engines.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,56 +15,56 @@
1515
common.engines.tk-3dsmaxplus.location:
1616
type: app_store
1717
name: tk-3dsmaxplus
18-
version: v0.6.1
18+
version: v0.6.2
1919
common.engines.tk-3dsmax.location:
2020
type: app_store
2121
name: tk-3dsmax
22-
version: v1.2.2
22+
version: v1.2.4
2323
common.engines.tk-houdini.location:
2424
type: app_store
2525
name: tk-houdini
26-
version: v1.8.2
26+
version: v1.8.3
2727
common.engines.tk-maya.location:
2828
type: app_store
2929
name: tk-maya
30-
version: v0.11.2
30+
version: v0.11.4
3131
common.engines.tk-nuke.location:
3232
type: app_store
3333
name: tk-nuke
34-
version: v0.14.3
34+
version: v0.14.4
3535
common.engines.tk-photoshopcc.location:
3636
type: app_store
3737
name: tk-photoshopcc
38-
version: v1.9.1
38+
version: v1.9.2
3939
common.engines.tk-aftereffects.location:
4040
type: app_store
4141
name: tk-aftereffects
42-
version: v0.3.1
42+
version: v0.3.2
4343
common.engines.tk-flame.location:
4444
type: app_store
4545
name: tk-flame
46-
version: v1.17.2
46+
version: v1.17.3
4747
common.engines.tk-alias.location:
4848
type: app_store
4949
name: tk-alias
50-
version: v2.1.3
50+
version: v2.1.5
5151
common.engines.tk-vred.location:
5252
type: app_store
5353
name: tk-vred
54-
version: v2.1.3
54+
version: v2.1.4
5555
common.engines.tk-desktop.location:
5656
type: app_store
5757
name: tk-desktop
58-
version: v2.6.2
58+
version: v2.6.3
5959
common.engines.tk-desktop2.location:
6060
type: app_store
6161
name: tk-desktop2
6262
version: v1.5.1
6363
common.engines.tk-shell.location:
6464
type: app_store
6565
name: tk-shell
66-
version: v0.9.1
66+
version: v0.9.2
6767
common.engines.tk-shotgun.location:
6868
type: app_store
6969
name: tk-shotgun
70-
version: v0.10.1
70+
version: v0.10.2

env/includes/common/frameworks.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ frameworks:
1717
location:
1818
type: app_store
1919
name: tk-framework-adobe
20-
version: v1.1.4
20+
version: v1.1.5
2121
tk-framework-qtwidgets_v2.x.x:
2222
location:
23-
version: v2.10.2
23+
version: v2.10.3
2424
type: app_store
2525
name: tk-framework-qtwidgets
2626
tk-framework-shotgunutils_v4.x.x:
@@ -30,12 +30,12 @@ frameworks:
3030
name: tk-framework-shotgunutils
3131
tk-framework-shotgunutils_v5.x.x:
3232
location:
33-
version: v5.8.4
33+
version: v5.8.5
3434
type: app_store
3535
name: tk-framework-shotgunutils
3636
tk-framework-adminui_v0.x.x:
3737
location:
38-
version: v0.7.1
38+
version: v0.7.2
3939
type: app_store
4040
name: tk-framework-adminui
4141
tk-framework-widget_v1.x.x:
@@ -45,21 +45,21 @@ frameworks:
4545
name: tk-framework-widget
4646
tk-framework-desktopserver_v1.x.x:
4747
location:
48-
version: v1.5.2
48+
version: v1.5.3
4949
type: app_store
5050
name: tk-framework-desktopserver
5151
tk-framework-desktopclient_v0.x.x:
5252
location:
53-
version: v0.3.1
53+
version: v0.3.2
5454
type: app_store
5555
name: tk-framework-desktopclient
5656
tk-framework-aliastranslations_v0.x.x:
5757
location:
58-
version: v0.2.1
58+
version: v0.2.2
5959
type: app_store
6060
name: tk-framework-aliastranslations
6161
tk-framework-lmv_v0.x.x:
6262
location:
63-
version: v0.2.1
63+
version: v0.2.2
6464
type: app_store
6565
name: tk-framework-lmv

env/includes/unreal/frameworks.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
frameworks:
77
tk-framework-unrealqt_v1.x.x:
88
location:
9-
version: v1.2.8
10-
type: git
11-
path: git@github.com:GPLgithub/tk-framework-unrealqt.git
12-
# path: git@github.com:ue4plugins/tk-framework-unrealqt.git
9+
version: v1.2.0
10+
type: github_release
11+
organization: ue4plugins
12+
repository: tk-framework-unrealqt

0 commit comments

Comments
 (0)