Skip to content

Commit

Permalink
fix(build): Replaces removed workflow to build debs with main in (#1487)
Browse files Browse the repository at this point in the history
Builder.
  • Loading branch information
jtk54 committed Mar 21, 2017
1 parent c105ccc commit d891adf
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
3 changes: 2 additions & 1 deletion dev/build_prevalidation.py
Expand Up @@ -56,7 +56,8 @@ def main():
else:
raise NotImplementedError('container_builder="{0}"'
.format(options.container_builder))
Builder.do_build(options, options.build_number, options.container_builder)
Builder.do_build(options, build_number=options.build_number,
container_builder=options.container_builder)
# Load version information into memory and write BOM to disk. Don't publish yet.
bom_generator.write_bom()
bom_generator.publish_microservice_configs()
Expand Down
19 changes: 16 additions & 3 deletions dev/build_release.py
Expand Up @@ -44,6 +44,7 @@
import argparse
import base64
import collections
import datetime
import glob
import os
import multiprocessing
Expand Down Expand Up @@ -123,7 +124,7 @@ def __init__(self, options, build_number=None, container_builder=None):
self.__background_processes = []

os.environ['NODE_ENV'] = os.environ.get('NODE_ENV', 'dev')
self.__build_number = build_number or os.environ.get('BUILD_NUMBER')
self.__build_number = build_number or os.environ.get('BUILD_NUMBER') or '{:%Y-%m-%d}'.format(datetime.datetime.now())
self.__gcb_service_account = options.gcb_service_account
self.__options = options
if (container_builder and container_builder not in ['gcb', 'docker']):
Expand Down Expand Up @@ -560,7 +561,7 @@ def __verify_bintray(self):


@classmethod
def do_build(cls, options, build_number, container_builder):
def do_build(cls, options, build_number=None, container_builder=None):
if options.build and not (options.bintray_repo):
sys.stderr.write('ERROR: Missing a --bintray_repo')
return -1
Expand All @@ -570,7 +571,8 @@ def do_build(cls, options, build_number, container_builder):
builder.refresher.pull_all_from_origin()

builder.build_packages()
builder.build_container_images()
if container_builder:
builder.build_container_images()

if options.build and options.bintray_repo:
fd, temp_path = tempfile.mkstemp()
Expand All @@ -594,3 +596,14 @@ def do_build(cls, options, build_number, container_builder):

print '\nFINISHED writing release to {rep}'.format(
rep=options.bintray_repo)

@classmethod
def main(cls):
parser = argparse.ArgumentParser()
cls.init_argument_parser(parser)
options = parser.parse_args()
# builds debians only
cls.do_build(options)

if __name__ == '__main__':
sys.exit(Builder.main())

0 comments on commit d891adf

Please sign in to comment.