Non-optimized builds

.orchestra/ci/ci-hook/app.py

@@ -44,6 +44,7 @@ def get_env_or_fail(var_name):
 mapping = config["github_to_gitlab_mapping"]
 default_user = config["default_user"]
 ci_user = config["ci_user"]
+revng_components_build_names = ["optimized", "debug", "release"]
 
 ORCHESTRA_CONFIG_REPO_HTTP_URL = config["orchestra_config_repo_http_url"]
 ORCHESTRA_CONFIG_REPO_SSH_URL = config["orchestra_config_repo_ssh_url"]
@@ -122,14 +123,18 @@ def trigger_ci(username, repo_url, ref, before, after):
             variables["SSH_PRIVATE_KEY"] = revng_push_ci_private_key
             variables["PUSH_CHANGES"] = "1"
 
-        parameters = {
-            "ref": BRANCH,
-            "variables": [{"key": key, "value": value}
-                          for key, value
-                          in variables.items()]
-        }
-        print(json.dumps(parameters, indent=2))
-        pipeline = project.pipelines.create(parameters)
+        # Create a job for each build name
+        for default_build_name in revng_components_build_names:
+            variables["REVNG_COMPONENTS_DEFAULT_BUILD"] = default_build_name
+
+            parameters = {
+                "ref": BRANCH,
+                "variables": [{"key": key, "value": value}
+                              for key, value
+                              in variables.items()]
+            }
+            print(json.dumps(parameters, indent=2))
+            pipeline = project.pipelines.create(parameters)
 
 
 @app.route('/ci-hook/gitlab', methods=["POST"])

.orchestra/ci/ci-run.sh

@@ -25,6 +25,7 @@
 # PROMOTE_BRANCHES: if == 1, promote next-* branches
 # PUSH_CHANGES:
 #   if == 1, push binary archives and promote next-* branches
+# REVNG_COMPONENTS_DEFAULT_BUILD: the default build for revng core components
 # PUSH_BINARY_ARCHIVE_EMAIL: used as author's email in binary archive commit
 # PUSH_BINARY_ARCHIVE_NAME: used as author's name in binary archive commit
 # SSH_PRIVATE_KEY: private key used to push binary archives
@@ -139,7 +140,7 @@ if test -n "$TARGET_COMPONENTS_URL"; then
                          | grep '^Component' \
                          | cut -d' ' -f2)"
         if test -z "$NEW_COMPONENT"; then
-            log "Warning: ignoring URL $TARGET_COMPONENT_URL since it doesn't match any component"
+            log_err "Warning: ignoring URL $TARGET_COMPONENT_URL since it doesn't match any component"
         else
             TARGET_COMPONENTS="$NEW_COMPONENT $TARGET_COMPONENTS"
         fi
@@ -175,7 +176,12 @@ cat >> "$USER_OPTIONS" <<EOF
   - master
 EOF
 
-# Print debug information
+# Set default builds
+if [[ -n "$REVNG_COMPONENTS_DEFAULT_BUILD" ]]; then
+    echo "#@overlay/replace" >> "$USER_OPTIONS"
+    echo "revng_components_default_build: $REVNG_COMPONENTS_DEFAULT_BUILD" >> "$USER_OPTIONS"
+fi
+
 log "User options:"
 cat "$USER_OPTIONS"
 

.orchestra/ci/ci.sh

@@ -2,15 +2,9 @@
 
 # rev.ng CI entrypoint script
 # This script checks out the correct configuration branch and initializes
-# variables for the actual CI script (ci-run.sh)
-#
-# Parameters are supplied as environment variables.
-#
-# Optional parameters:
-#
-# PUSHED_REF:
-#   orchestra config commit/branch to use.
-#   Normally set by Gitlab or whoever triggers the CI.
+# variables, then it runs the appropriate script for the given CI stage
+# Parameters:
+#  $1 - CI stage: [build|post-build]
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 ORCHESTRA_DIR="$DIR/../.."
@@ -38,6 +32,11 @@ function log_err() {
 
 set -e
 
+if ! [[ "$1" =~ ^(post-)?build$ ]]; then
+    log_err "The first parameter of ci.sh must be 'build' or 'post-build'!"
+    exit 1
+fi
+
 # Determine target branch
 #
 # PUSHED_REF contains the git ref that was pushed and triggered the CI.
@@ -87,4 +86,8 @@ export COMPONENT_TARGET_BRANCH
 
 # Run "true" CI script
 log "Starting ci-run with COMPONENT_TARGET_BRANCH=$COMPONENT_TARGET_BRANCH"
-"$DIR/ci-run.sh"
+if [[ "$1" == "build" ]]; then
+    "$DIR/ci-run.sh"
+else
+    "$DIR/post-build.sh"
+fi

.orchestra/config/components/caliban.yml

@@ -1,3 +1,4 @@
+#@ load("@ytt:data", "data")
 #@ load("@ytt:overlay", "overlay")
 
 #@ load("/lib/cmake.lib.yml", "cmake_boost_configuration", "typical_cmake_builds")
@@ -29,5 +30,5 @@ components:
     repository: caliban
     license: LICENSE.md
     binary_archives: private
-    default_build: optimized
+    default_build: #@ data.values.revng_components_default_build
     builds: #@ typical_cmake_builds(**build_args())

.orchestra/config/components/llvm.yml

@@ -19,7 +19,7 @@
 #@ def llvm_component(use_asan=False):
 repository: llvm-project
 license: llvm/LICENSE.TXT
-default_build: optimized
+default_build: #@ data.values.revng_components_default_build
 builds:
   #@ for flavor, f_options in typical_project_flavors(use_asan=use_asan).items():
     #@ build_type = f_options["cmake_build_type"]

.orchestra/config/components/qemu.yml

@@ -8,7 +8,7 @@
 #@ def qemu_component(use_asan=False):
 repository: qemu
 license: LICENSE
-default_build: optimized
+default_build: #@ data.values.revng_components_default_build
 builds:
   #@ for flavor, f_options in typical_project_flavors(use_asan=use_asan).items():
     #@ build_type = f_options["cmake_build_type"]

.orchestra/config/components/revng.yml

@@ -1,3 +1,4 @@
+#@ load("@ytt:data", "data")
 #@ load("@ytt:overlay", "overlay")
 #@ load("/lib/cmake.lib.yml", "cmake_boost_configuration", "typical_cmake_builds")
 
@@ -26,5 +27,5 @@ components:
   revng:
     repository: revng
     license: LICENSE.md
-    default_build: optimized
+    default_build: #@ data.values.revng_components_default_build
     builds: #@ typical_cmake_builds(**build_args())

.orchestra/config/components/revng_c.yml

@@ -1,3 +1,4 @@
+#@ load("@ytt:data", "data")
 #@ load("@ytt:overlay", "overlay")
 #@ load("/lib/cmake.lib.yml", "cmake_boost_configuration", "typical_cmake_builds")
 
@@ -24,6 +25,6 @@ components:
   revng-c:
     repository: revng-c
     license: LICENSE.md
-    default_build: optimized
+    default_build: #@ data.values.revng_components_default_build
     binary_archives: private
     builds: #@ typical_cmake_builds(**build_args())

.orchestra/config/components/ui/adaptagrams.yml

@@ -1,3 +1,4 @@
+#@ load("@ytt:data", "data")
 #@ load("@ytt:overlay", "overlay")
 #@ load("/lib/cmake.lib.yml", "typical_cmake_builds")
 
@@ -19,5 +20,5 @@ components:
   ui/adaptagrams:
     repository: ui-adaptagrams
     license: README.md
-    default_build: optimized
+    default_build: #@ data.values.revng_components_default_build
     builds: #@ typical_cmake_builds(**build_args())

.orchestra/config/components/ui/cold_revng.yml

@@ -1,3 +1,4 @@
+#@ load("@ytt:data", "data")
 #@ load("@ytt:overlay", "overlay")
 #@ load("@ytt:template", "template")
 
@@ -39,5 +40,5 @@ components:
     repository: ui-cold-revng
     license: LICENSE.md
     binary_archives: private
-    default_build: optimized
+    default_build: #@ data.values.revng_components_default_build
     builds: #@ typical_cmake_builds(**build_args())

.orchestra/config/components/ui/qt.yml

@@ -1,6 +1,6 @@
 #@ load("@ytt:data", "data")
 #@ load("@ytt:overlay", "overlay")
-#@ load("/lib/make.lib.yml", "make")
+#@ load("/lib/make.lib.yml", "make", "serial_make")
 #@ load("/lib/shell.lib.yml", "expand_args")
 #@ load("/lib/optimization_flavors.lib.yml", "qt_optimization_flavors")
 
@@ -98,7 +98,7 @@
 ---
 #@ def qt_component():
 license: LICENSE.GPLv3
-default_build: optimized
+default_build: #@ data.values.revng_components_default_build
 builds:
   #@ for flavor, opts in qt_optimization_flavors.items():
   #@ extra_qmake_options = opts["extra_qmake_options"]
@@ -115,7 +115,7 @@ builds:
       cd "$BUILD_DIR"
 
       (@= make @)
-      (@= make @) install INSTALL_ROOT=$TMP_ROOT
+      (@= serial_make @) install INSTALL_ROOT=$TMP_ROOT
 
       rm "${TMP_ROOT}${ORCHESTRA_ROOT}/lib64/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake"
       touch "${TMP_ROOT}${ORCHESTRA_ROOT}/lib64/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake"

.orchestra/config/components/ui/qt_creator.yml

@@ -1,3 +1,4 @@
+#@ load("@ytt:data", "data")
 #@ load("@ytt:overlay", "overlay")
 #@ load("/lib/make.lib.yml", "make")
 #@ load("/lib/shell.lib.yml", "expand_args")
@@ -41,7 +42,7 @@
 #@ def qt_creator_component():
 repository: ui-qt-creator
 license: LICENSE.GPL3-EXCEPT
-default_build: optimized
+default_build: #@ data.values.revng_components_default_build
 builds:
   #@ for flavor, opts in qmake_optimization_flavors.items():
   #@ extra_qmake_args = opts["extra_qmake_args"]

.orchestra/config/components/ui/quickqanava.yml

@@ -1,3 +1,4 @@
+#@ load("@ytt:data", "data")
 #@ load("@ytt:overlay", "overlay")
 #@ load("/lib/cmake.lib.yml", "cmake_boost_configuration", "typical_cmake_builds")
 
@@ -22,5 +23,5 @@ components:
   ui/quickqanava:
     repository: ui-quickqanava
     license: licence.txt
-    default_build: optimized
+    default_build: #@ data.values.revng_components_default_build
     builds: #@ typical_cmake_builds(**build_args())

.orchestra/config/global_options.yml

@@ -36,3 +36,5 @@ branches:
   - develop
   - master
 nonredistributable_base_url: "https://dummydomain.com/nonredistributable/"
+
+revng_components_default_build: optimized