From 0aa061f6f89e6ac22234dac866a975b64ad3abaa Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 3 Jun 2020 11:27:02 -0400 Subject: Sphinx/create_identifiers: remove unused import --- Utilities/Sphinx/create_identifiers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/Sphinx/create_identifiers.py b/Utilities/Sphinx/create_identifiers.py index b5cd914..120b63d 100755 --- a/Utilities/Sphinx/create_identifiers.py +++ b/Utilities/Sphinx/create_identifiers.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -import sys, os +import sys if len(sys.argv) != 2: sys.exit(-1) -- cgit v0.12 From e237fc65b70212f6ba2d8c163b1ea9bdf7b83e6a Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 3 Jun 2020 11:27:46 -0400 Subject: Sphinx/create_identifiers: use `not in` not `not _ in` --- Utilities/Sphinx/create_identifiers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/Sphinx/create_identifiers.py b/Utilities/Sphinx/create_identifiers.py index 120b63d..f3dbbcc 100755 --- a/Utilities/Sphinx/create_identifiers.py +++ b/Utilities/Sphinx/create_identifiers.py @@ -38,7 +38,7 @@ for line in lines: for domain_object_string, domain_object_type in mapping: if " Date: Wed, 3 Jun 2020 11:40:01 -0400 Subject: Sphinx/create_identifiers: handle qhp contents as utf-8 --- Utilities/Sphinx/create_identifiers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Utilities/Sphinx/create_identifiers.py b/Utilities/Sphinx/create_identifiers.py index f3dbbcc..e35f127 100755 --- a/Utilities/Sphinx/create_identifiers.py +++ b/Utilities/Sphinx/create_identifiers.py @@ -6,12 +6,12 @@ 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) @@ -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)) -- cgit v0.12 From 45f2786ff76f3505c33b99e6b36b8ad1dab5d8f0 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 3 Jun 2020 11:44:24 -0400 Subject: Release/linux: remove explicit LANG setting It shouldn't be needed anymore now that the Sphinx scripts are reading UTF-8 content explicitly. --- Utilities/Release/linux/x86_64/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Utilities/Release/linux/x86_64/Dockerfile b/Utilities/Release/linux/x86_64/Dockerfile index 41391d2..539954a 100644 --- a/Utilities/Release/linux/x86_64/Dockerfile +++ b/Utilities/Release/linux/x86_64/Dockerfile @@ -20,7 +20,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) \ -- cgit v0.12 From c5b072800df29f4250e69002c880693b46000c7a Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 3 Jun 2020 10:19:25 -0400 Subject: gitlab-ci: add jobs for reproducing the release binaries --- .gitlab-ci.yml | 54 +++++++++++++++++++++++++++++++ Utilities/Release/linux/x86_64/Dockerfile | 1 + 2 files changed, 55 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf7cb26..8339dc0 100644 --- a/.gitlab-ci.yml +++ b/.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" @@ -199,6 +206,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 @@ -279,6 +318,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 @@ -353,6 +399,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 diff --git a/Utilities/Release/linux/x86_64/Dockerfile b/Utilities/Release/linux/x86_64/Dockerfile index 539954a..972913e 100644 --- a/Utilities/Release/linux/x86_64/Dockerfile +++ b/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 -- cgit v0.12 From 922cd3affe88b07db89c80012b11e759cd7b5e63 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 3 Jun 2020 13:02:16 -0400 Subject: ci: fix the project detection for CDash submissions --- .gitlab/ci/gitlab_ci.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/gitlab_ci.cmake b/.gitlab/ci/gitlab_ci.cmake index e9c9f80..698d5ea 100644 --- a/.gitlab/ci/gitlab_ci.cmake +++ b/.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") -- cgit v0.12