Merge topic 'linux-release-builders'

922cd3affe ci: fix the project detection for CDash submissions
c5b072800d gitlab-ci: add jobs for reproducing the release binaries
45f2786ff7 Release/linux: remove explicit LANG setting
c540fcaa6b Sphinx/create_identifiers: handle qhp contents as utf-8
e237fc65b7 Sphinx/create_identifiers: use `not in` not `not _ in`
0aa061f6f8 Sphinx/create_identifiers: remove unused import

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4852

.gitlab-ci.yml

@@ -13,6 +13,13 @@
       when: always
     - when: never
 
+.release_linux: &release_linux
+    image: "kitware/cmake:build-linux-x86_64-deps-2020-04-02@sha256:77e9ab183f34680990db9da5945473e288f0d6556bce79ecc1589670d656e157"
+
+    variables:
+        GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
+        LAUNCHER: "scl enable devtoolset-6 rh-python36 --"
+
 .fedora31: &fedora31
     image: "kitware/cmake:ci-fedora31-x86_64-2020-06-01"
 
@@ -226,6 +233,38 @@
 
     interruptible: true
 
+.cmake_build_release_linux: &cmake_build_release_linux
+    stage: build
+
+    script:
+        # Bootstrap.
+        - mkdir build/
+        - cp -v Utilities/Release/linux/x86_64/cache.txt build/CMakeCache.txt
+        # Make sccache available.
+        - .gitlab/ci/sccache.sh
+        - export PATH=$PWD/.gitlab:$PATH
+        # Append sccache settings to the cache.
+        - echo "CMAKE_C_COMPILER_LAUNCHER:STRING=sccache" >> build/CMakeCache.txt
+        - echo "CMAKE_CXX_COMPILER_LAUNCHER:STRING=sccache" >> build/CMakeCache.txt
+        # CI settings.
+        - echo "CMake_TEST_INSTALL:BOOL=OFF" >> build/CMakeCache.txt
+        - echo "CMAKE_INSTALL_PREFIX:PATH=$PWD/build/install" >> build/CMakeCache.txt
+        - echo "CMAKE_SKIP_INSTALL_ALL_DEPENDENCY:BOOL=ON" >> build/CMakeCache.txt
+        # Bootstrap
+        - cd build/
+        - "$LAUNCHER ../bootstrap --parallel=$(nproc) --docdir=doc/cmake"
+        # FIXME: When CTest can drive an external CMake for the build as well,
+        # use the scripts here.
+        - "$LAUNCHER make -j$(nproc)"
+        # NOTE: This regex matches that used in the release build.
+        - "$LAUNCHER bin/ctest --output-on-failure -j$(nproc) -R '^(CMake\\.|CMakeLib\\.|CMakeServerLib\\.|RunCMake\\.ctest_memcheck)'"
+        # Make a package.
+        - bin/cpack -G TGZ
+        - bin/cpack -G STGZ
+        - sccache --show-stats
+
+    interruptible: true
+
 .cmake_build_windows: &cmake_build_windows
     stage: build
 
@@ -306,6 +345,13 @@
             - build/DartConfiguation.tcl
             - build/CTestCustom.cmake
 
+.cmake_release_artifacts: &cmake_release_artifacts
+    artifacts:
+        expire_in: 5d
+        paths:
+            # Any packages made.
+            - build/cmake-*-Linux-x86_64.*
+
 .cmake_test_artifacts: &cmake_test_artifacts
     artifacts:
         expire_in: 1d
@@ -380,6 +426,14 @@ build:fedora31-sphinx:
         - *linux_builder_tags_qt
     rules: *rules_settings
 
+build:centos6-release:
+    <<:
+        - *release_linux
+        - *cmake_build_release_linux
+        - *cmake_release_artifacts
+        - *linux_builder_tags
+    rules: *manual_rules_settings
+
 build:fedora31-ninja:
     <<:
         - *fedora31_ninja

.gitlab/ci/gitlab_ci.cmake

@@ -49,7 +49,7 @@ endif ()
 set(ctest_track "Experimental")
 if (NOT "$ENV{CI_MERGE_REQUEST_ID}" STREQUAL "")
   set(ctest_track "merge-requests")
-elseif ("$ENV{CI_PROJECT_PATH}" STREQUAL "cmb/smtk")
+elseif ("$ENV{CI_PROJECT_PATH}" STREQUAL "cmake/cmake")
   if ("$ENV{CI_COMMIT_REF_NAME}" STREQUAL "master")
     set(ctest_track "master")
   elseif ("$ENV{CI_COMMIT_REF_NAME}" STREQUAL "release")

Utilities/Release/linux/x86_64/Dockerfile

@@ -5,6 +5,7 @@
 # Build using the CMake source directory as the build context.
 # The resulting image will have an '/out' directory containing the package.
 
+# Keep this in sync with the `.gitlab-ci.yml` `release_linux` image.
 ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-x86_64-deps-2020-04-02
 ARG FROM_IMAGE_DIGEST=@sha256:77e9ab183f34680990db9da5945473e288f0d6556bce79ecc1589670d656e157
 ARG FROM_IMAGE=$FROM_IMAGE_NAME$FROM_IMAGE_DIGEST
@@ -20,7 +21,6 @@ RUN : \
  && cp ../cmake/Utilities/Release/linux/x86_64/cache.txt CMakeCache.txt \
  && source /opt/rh/devtoolset-6/enable \
  && source /opt/rh/rh-python36/enable \
- && export LANG=en_US.UTF-8 \
  && set -x \
  && ../cmake/bootstrap --parallel=$(nproc) --docdir=doc/cmake \
  && nice make -j $(nproc) \

Utilities/Sphinx/create_identifiers.py

@@ -1,17 +1,17 @@
 #!/usr/bin/env python
 
-import sys, os
+import sys
 
 if len(sys.argv) != 2:
   sys.exit(-1)
 name = sys.argv[1] + "/CMake.qhp"
 
-f = open(name)
+f = open(name, "rb")
 
 if not f:
   sys.exit(-1)
 
-lines = f.read().splitlines()
+lines = f.read().decode("utf-8").splitlines()
 
 if not lines:
   sys.exit(-1)
@@ -38,7 +38,7 @@ for line in lines:
 
   for domain_object_string, domain_object_type in mapping:
     if "<keyword name=\"" + domain_object_string + "\"" in line:
-      if not "id=\"" in line and not "#index-" in line:
+      if "id=\"" not in line and "#index-" not in line:
         prefix = "<keyword name=\"" + domain_object_string + "\" "
         part1, part2 = line.split(prefix)
         head, tail = part2.split("#" + domain_object_type + ":")
@@ -46,5 +46,5 @@ for line in lines:
         line = part1 + prefix + "id=\"" + domain_object_type + "/" + domain_object + "\" " + part2
   newlines.append(line + "\n")
 
-f = open(name, "w")
-f.writelines(newlines)
+f = open(name, "wb")
+f.writelines(map(lambda line: line.encode("utf-8"), newlines))