Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the .gitlab-ci.yml structure

Browse Source 
Beginned with new building system
.gitlab-ci.yml can now be generated by the script assemble-gitlab-ci.py.

Therefore the .gitlab-ci.yml configuration file can be split into several smaller files
This commit is contained in:
Johannes Lenzen
2020-02-04 12:29:33 +01:00
committed by Jan Möbius
parent c7ddfa903b
commit 92387f4c2a
2 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -3,7 +3,7 @@
# This is an auto generated file. Do not make # # This is an auto generated file. Do not make #
# changes to this file. They possible will be overriden. # # changes to this file. They possible will be overriden. #
# # # #
# To make persistent changes changes files in # # To make persistent changes, changes files in #
# ./CI/gitlab-ci/ ... # # ./CI/gitlab-ci/ ... #
# and regenerate this file with the configuration tool # # and regenerate this file with the configuration tool #
# python3 ./CI/gitlab-ci/assemble-gitlab-ci.py # # python3 ./CI/gitlab-ci/assemble-gitlab-ci.py #

35
CI/gitlab-ci/assemble-gitlab-ci.py
View File

@@ -1,8 +1,8 @@
#!/usr/bin/python3 #!/usr/bin/python3
import sys, os, re import sys, os, re, yaml, hashlib
# Version 3 # Version 3.2
# Script for automated gitlab-ci creation # Script for automated gitlab-ci creation
# Assembles the gitlab ci from master template file: # Assembles the gitlab ci from master template file:
@@ -32,7 +32,7 @@ autogenerated_notice = """######################################################
# This is an auto generated file. Do not make # # This is an auto generated file. Do not make #
# changes to this file. They possible will be overriden. # # changes to this file. They possible will be overriden. #
# # # #
# To make persistent changes changes files in # # To make persistent changes, changes files in #
# ./CI/gitlab-ci/ ... # # ./CI/gitlab-ci/ ... #
# and regenerate this file with the configuration tool # # and regenerate this file with the configuration tool #
# python3 ./CI/gitlab-ci/assemble-gitlab-ci.py # # python3 ./CI/gitlab-ci/assemble-gitlab-ci.py #
@@ -86,10 +86,10 @@ def assembleTarget(master, depth=maxFileRecursionDepth):
if depth < 0: if depth < 0:
raise "Max depth reached. Possible circular import?" raise "Max depth reached. Possible circular import?"
print_prefix = "" print_prefix = ""
for i in range(0, maxFileRecursionDepth-depth): for _ in range(0, maxFileRecursionDepth-depth):
print_prefix = " | \t" + print_prefix print_prefix = print_prefix + " | \t"
print_prefix_inverse = "" print_prefix_inverse = ""
for i in range(0, depth): for _ in range(0, depth):
print_prefix_inverse = print_prefix_inverse + "\t" print_prefix_inverse = print_prefix_inverse + "\t"
master_content = readFile(master) master_content = readFile(master)
@@ -139,14 +139,35 @@ def main():
os.chdir(findCIAssemblyDirectory()) os.chdir(findCIAssemblyDirectory())
target_content = autogenerated_notice target_content = autogenerated_notice
target_content += assembleTarget(master_file) target_content += assembleTarget(master_file)
print("Writing config to file "+target_file)
m = hashlib.sha256()
m.update(readFile(target_file).encode('utf-8'))
hash_original = m.hexdigest()
m = hashlib.sha256()
m.update(target_content.encode('utf-8'))
m.update("\n".encode('utf-8'))
hash_new = m.hexdigest()
print("Old checksum: ", hash_original)
print("New checksum: ", hash_new)
if (hash_original == hash_new):
print("No changes made: Skipping file write")
else:
print("File differs")
print("Writing config to file "+target_file)
target_file_handle = open(target_file, "w") target_file_handle = open(target_file, "w")
target_file_handle.write(target_content) target_file_handle.write(target_content)
target_file_handle.write("\n") target_file_handle.write("\n")
target_file_handle.flush() target_file_handle.flush()
target_file_handle.close() target_file_handle.close()
try:
yaml.load(target_content, Loader=yaml.SafeLoader)
print("Yaml syntax check: OK")
except Exception as e:
print("Invalid yaml syntax:", e)
print("Finished.") print("Finished.")