mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
Fixes
This commit is contained in:
parent
cae2f8a361
commit
53eb5c79ba
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
@ -65,7 +65,7 @@ jobs:
|
|||||||
TEMP_PATH: ${{runner.temp}}/build_check
|
TEMP_PATH: ${{runner.temp}}/build_check
|
||||||
REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
|
REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
|
||||||
CHECK_NAME: 'ClickHouse build check (actions)'
|
CHECK_NAME: 'ClickHouse build check (actions)'
|
||||||
run: mkdir -p $TEMP_PATH && cp -r $GITHUB_WORKSPACE $TEMP_PATH && cd $REPO_COPY/tests/ci && python3 build_check.py $CHECK_NAME ${{ matrix.build_number }} '21.10.1.1'
|
run: mkdir -p $TEMP_PATH && cp -r $GITHUB_WORKSPACE $TEMP_PATH && cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" ${{ matrix.build_number }} '21.10.1.1'
|
||||||
- name: Upload build URLs to artifacts
|
- name: Upload build URLs to artifacts
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
|
@ -23,11 +23,12 @@ def get_build_config(build_check_name, build_number, repo_path):
|
|||||||
|
|
||||||
ci_config_path = os.path.join(repo_path, "tests/ci/ci_config.json")
|
ci_config_path = os.path.join(repo_path, "tests/ci/ci_config.json")
|
||||||
with open(ci_config_path, 'r') as ci_config:
|
with open(ci_config_path, 'r') as ci_config:
|
||||||
return ci_config[build_config_name][build_number]
|
config_dict = json.load(ci_config)
|
||||||
|
return config_dict[build_config_name][build_number]
|
||||||
|
|
||||||
|
|
||||||
def _can_export_binaries(build_config):
|
def _can_export_binaries(build_config):
|
||||||
if build_config['package_type'] != 'deb':
|
if build_config['package-type'] != 'deb':
|
||||||
return False
|
return False
|
||||||
if build_config['bundled'] != "bundled":
|
if build_config['bundled'] != "bundled":
|
||||||
return False
|
return False
|
||||||
@ -35,21 +36,18 @@ def _can_export_binaries(build_config):
|
|||||||
return False
|
return False
|
||||||
if build_config['sanitizer'] != '':
|
if build_config['sanitizer'] != '':
|
||||||
return True
|
return True
|
||||||
if build_config[''] != '':
|
if build_config['build-type'] != '':
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def get_packager_cmd(build_config, packager_path, output_path, build_version, image_version):
|
def get_packager_cmd(build_config, packager_path, output_path, build_version, image_version):
|
||||||
cmd = "cd {ppath} && ./packager --output-dir={odir} --package-type={package_type} --compiler={comp}".format(
|
package_type = build_config['package-type']
|
||||||
ppath=packager_path,
|
comp = build_config['compiler']
|
||||||
odir=output_path,
|
cmd = f"cd {packager_path} && ./packager --output-dir={output_path} --package-type={package_type} --compiler={comp}"
|
||||||
package_type=build_config['package-type'],
|
|
||||||
comp=build_config['compiler']
|
|
||||||
)
|
|
||||||
|
|
||||||
if build_config['build_type']:
|
if build_config['build-type']:
|
||||||
cmd += ' --build-type={}'.format(build_config['build_type'])
|
cmd += ' --build-type={}'.format(build_config['build-type'])
|
||||||
if build_config['sanitizer']:
|
if build_config['sanitizer']:
|
||||||
cmd += ' --sanitizer={}'.format(build_config['sanitizer'])
|
cmd += ' --sanitizer={}'.format(build_config['sanitizer'])
|
||||||
if build_config['bundled'] == 'unbundled':
|
if build_config['bundled'] == 'unbundled':
|
||||||
@ -73,7 +71,7 @@ def get_packager_cmd(build_config, packager_path, output_path, build_version, im
|
|||||||
def get_image_name(build_config):
|
def get_image_name(build_config):
|
||||||
if build_config['bundled'] != 'bundled':
|
if build_config['bundled'] != 'bundled':
|
||||||
return 'clickhouse/unbundled-builder'
|
return 'clickhouse/unbundled-builder'
|
||||||
elif build_config['package_type'] != 'deb':
|
elif build_config['package-type'] != 'deb':
|
||||||
return 'clickhouse/binary-builder'
|
return 'clickhouse/binary-builder'
|
||||||
else:
|
else:
|
||||||
return 'clickhouse/deb-builder'
|
return 'clickhouse/deb-builder'
|
||||||
@ -87,27 +85,27 @@ def build_clickhouse(packager_cmd, logs_path):
|
|||||||
logging.info("Built successfully")
|
logging.info("Built successfully")
|
||||||
else:
|
else:
|
||||||
logging.info("Build failed")
|
logging.info("Build failed")
|
||||||
return build_log_path, success
|
return build_log_path, retcode == 0
|
||||||
|
|
||||||
def build_config_to_string(build_config):
|
def build_config_to_string(build_config):
|
||||||
if build_config["package_type"] == "performance":
|
if build_config["package-type"] == "performance":
|
||||||
return "performance"
|
return "performance"
|
||||||
|
|
||||||
return "_".join([
|
return "_".join([
|
||||||
build_config['compiler'],
|
build_config['compiler'],
|
||||||
build_config['build_type'] if build_config['build_type'] else "relwithdebuginfo",
|
build_config['build-type'] if build_config['build-type'] else "relwithdebuginfo",
|
||||||
build_config['sanitizer'] if build_config['sanitizer'] else "none",
|
build_config['sanitizer'] if build_config['sanitizer'] else "none",
|
||||||
build_config['bundled'],
|
build_config['bundled'],
|
||||||
build_config['splitted'],
|
build_config['splitted'],
|
||||||
build_config['tidy'],
|
"tidy" if build_config['tidy'] else "notidy",
|
||||||
build_config['with_coverage'],
|
"with_coverage" if build_config['with_coverage'] else "without_coverage",
|
||||||
build_config['package_type'],
|
build_config['package-type'],
|
||||||
])
|
])
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
logging.basicConfig(level=logging.INFO)
|
logging.basicConfig(level=logging.INFO)
|
||||||
repo_path = os.path.join(os.getenv("REPO_COPY", os.path.abspath("../../")))
|
repo_path = os.getenv("REPO_COPY", os.path.abspath("../../"))
|
||||||
temp_path = os.path.join(os.getenv("TEMP_PATH"))
|
temp_path = os.getenv("TEMP_PATH", os.path.abspath("."))
|
||||||
|
|
||||||
build_check_name = sys.argv[1]
|
build_check_name = sys.argv[1]
|
||||||
build_number = int(sys.argv[2])
|
build_number = int(sys.argv[2])
|
||||||
@ -140,7 +138,8 @@ if __name__ == "__main__":
|
|||||||
|
|
||||||
for i in range(10):
|
for i in range(10):
|
||||||
try:
|
try:
|
||||||
subprocess.check_output(f"docker pull {image_name}:{image_version}", shell=True)
|
logging.info(f"Pulling image {image_name}:{image_version}")
|
||||||
|
subprocess.check_output(f"docker pull {image_name}:{image_version}", stderr=subprocess.STDOUT, shell=True)
|
||||||
break
|
break
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
time.sleep(i * 3)
|
time.sleep(i * 3)
|
||||||
@ -150,6 +149,7 @@ if __name__ == "__main__":
|
|||||||
|
|
||||||
|
|
||||||
build_name = build_config_to_string(build_config)
|
build_name = build_config_to_string(build_config)
|
||||||
|
logging.info(f"Build short name {build_name}")
|
||||||
os.environ['BUILD_NAME'] = build_name
|
os.environ['BUILD_NAME'] = build_name
|
||||||
|
|
||||||
build_output_path = os.path.join(temp_path, build_name)
|
build_output_path = os.path.join(temp_path, build_name)
|
||||||
|
Loading…
Reference in New Issue
Block a user