projects
/
cdist.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
42ceee7
)
(Optionally) notarize all macOS builds.
author
Carl Hetherington
<cth@carlh.net>
Wed, 30 Dec 2020 00:49:03 +0000
(
01:49
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 14 Jan 2021 02:31:03 +0000
(
03:31
+0100)
cdist
patch
|
blob
|
history
diff --git
a/cdist
b/cdist
index f7094a076f3b2688b18581f44112bb070818ff5a..2327a4e58b763e02f4c2cd802f1c5b810e42e17c 100755
(executable)
--- a/
cdist
+++ b/
cdist
@@
-425,7
+425,7
@@
class Target(object):
def setup(self):
pass
def setup(self):
pass
- def _build_packages(self, tree, options):
+ def _build_packages(self, tree, options
, notarize
):
if len(inspect.getfullargspec(tree.cscript['package']).args) == 3:
packages = tree.call('package', tree.version, options)
else:
if len(inspect.getfullargspec(tree.cscript['package']).args) == 3:
packages = tree.call('package', tree.version, options)
else:
@@
-441,7
+441,7
@@
class Target(object):
def package(self, project, checkout, output_dir, options, notarize):
tree = self.build(project, checkout, options)
tree.add_defaults(options)
def package(self, project, checkout, output_dir, options, notarize):
tree = self.build(project, checkout, options)
tree.add_defaults(options)
- p = self._build_packages(tree, options)
+ p = self._build_packages(tree, options
, notarize
)
self._copy_packages(tree, p, output_dir)
def build(self, project, checkout, options):
self._copy_packages(tree, p, output_dir)
def build(self, project, checkout, options):
@@
-778,6
+778,15
@@
class OSXTarget(Target):
def unlock_keychain(self):
self.command('security unlock-keychain -p %s %s' % (self.osx_keychain_password, self.osx_keychain_file))
def unlock_keychain(self):
self.command('security unlock-keychain -p %s %s' % (self.osx_keychain_password, self.osx_keychain_file))
+ def _build_packages(self, tree, options, notarize):
+ p = super()._build_packages(tree, options, notarize)
+ for x in p:
+ if not isinstance(x, tuple):
+ raise Error('macOS packages must be returned from cscript as tuples of (dmg-filename, bundle-id)')
+ if notarize:
+ notarize_dmg(x[0], x[1])
+ return p
+
class OSXSingleTarget(OSXTarget):
def __init__(self, arch, sdk, directory=None):
class OSXSingleTarget(OSXTarget):
def __init__(self, arch, sdk, directory=None):
@@
-813,12
+822,7
@@
class OSXSingleTarget(OSXTarget):
tree = self.build(project, checkout, options)
tree.add_defaults(options)
self.unlock_keychain()
tree = self.build(project, checkout, options)
tree.add_defaults(options)
self.unlock_keychain()
- p = self._build_packages(tree, options)
- for x in p:
- if not isinstance(x, tuple):
- raise Error('macOS packages must be returned from cscript as tuples of (dmg-filename, bundle-id)')
- if notarize:
- notarize_dmg(x[0], x[1])
+ p = self._build_packages(tree, options, notarize)
self._copy_packages(tree, [x[0] for x in p], output_dir)
self._copy_packages(tree, [x[0] for x in p], output_dir)
@@
-844,8
+848,7
@@
class OSXUniversalTarget(OSXTarget):
self.unlock_keychain()
tree = globals.trees.get(project, checkout, self)
with TreeDirectory(tree):
self.unlock_keychain()
tree = globals.trees.get(project, checkout, self)
with TreeDirectory(tree):
- self._build_packages(tree, options)
- for p in packages:
+ for p in self._build_packages(tree, options, notarize):
copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))))
class SourceTarget(Target):
copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))))
class SourceTarget(Target):