Commit Graph

167 Commits

Author SHA1 Message Date
Brad King acdbdad1d4 Merge topic 'ci-vs-16.8-in-16.9'
7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5910
2021-03-15 13:49:23 -04:00
Brad King 7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9
The 16.8 and 16.9 toolset numbers vary only in their third component.
Use CMake 3.19.7 for three-component toolset version specification
support.
2021-03-15 12:19:00 -04:00
Brad King aed12e10eb Merge topic 'ci-build-no-doc'
9b5eae9cde gitlab-ci: remove redundant sphinx build from release-style CI jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5905
2021-03-12 13:27:09 -05:00
Brad King 9b5eae9cde gitlab-ci: remove redundant sphinx build from release-style CI jobs
The Sphinx build is mostly serial and takes a long time.  All our CI
pipelines (packaging, integration branches, merge requests) have a
dedicated job for the Sphinx build.
2021-03-12 13:05:55 -05:00
Brad King 31be23dd1d ci: Restore the Module.ExternalData test on Windows
In commit a58e3c7e8b (ci: Skip the Module.ExternalData test on Windows,
2020-10-01, v3.19.0-rc1~59^2) the test was dropped pending further
investigation.  We've now (hopefully) resolved the underlying problem,
so we can restore the test.
2021-03-05 10:59:20 -05:00
Brad King 594483728c Merge topic 'ci-nightly-ide-jobs'
e5698605d7 gitlab-ci: ignore failing tests for external IDE testing
beb130c65d gitlab-ci: allow some jobs to ignore failing tests on nightly runs
18d6737e96 gitlab-ci: always upload test and release artifacts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5871
2021-03-03 09:04:31 -05:00
Ben Boeckel e5698605d7 gitlab-ci: ignore failing tests for external IDE testing 2021-03-01 16:06:22 -05:00
Ben Boeckel beb130c65d gitlab-ci: allow some jobs to ignore failing tests on nightly runs 2021-03-01 15:51:27 -05:00
Ben Boeckel 18d6737e96 gitlab-ci: always upload test and release artifacts 2021-03-01 15:51:07 -05:00
Brad King 304ed74dc3 Merge topic 'ci-xcode-12.4'
85ef0a84a0 gitlab-ci: update macOS jobs to use Xcode 12.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5858
2021-02-25 10:52:35 -05:00
Brad King 85ef0a84a0 gitlab-ci: update macOS jobs to use Xcode 12.4 2021-02-25 09:09:12 -05:00
Brad King 8697701100 Merge topic 'ci-macos-arm64'
397ced99d7 gitlab-ci: Add macos-arm64 jobs for Ninja and Xcode
0755c2ffbb gitlab-ci: rename macos build and test jobs to macos-x86_64
73150a3798 ci: add sccache 0.2.15 custom build for aarch64-apple-darwin
cab41b96ac ci: update to sccache 0.2.15 on linux builds
8dcbe5688a ci: Use Qt macOS 10.13+ package for macOS build and test jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5851
2021-02-23 13:00:46 -05:00
Brad King 397ced99d7 gitlab-ci: Add macos-arm64 jobs for Ninja and Xcode
For now, leave these jobs out during merge requests.
2021-02-23 11:21:59 -05:00
Brad King 0755c2ffbb gitlab-ci: rename macos build and test jobs to macos-x86_64
This makes room for future equivalents for other architectures.
The packaging jobs produce universal binaries, so leave them as-is.
2021-02-23 11:21:59 -05:00
Brad King 73150a3798 ci: add sccache 0.2.15 custom build for aarch64-apple-darwin
Our custom build includes a patch to avoid server startup timeouts.
2021-02-23 11:21:11 -05:00
Brad King cab41b96ac ci: update to sccache 0.2.15 on linux builds
The upstream release includes binaries for the architectures we need.
However, the binaries do not have execute permission in their tarballs,
so add it explicitly.
2021-02-23 09:33:28 -05:00
Brad King 8dcbe5688a ci: Use Qt macOS 10.13+ package for macOS build and test jobs
It is a universal binary for both `x86_64` and `arm64` architectures.
2021-02-23 09:33:28 -05:00
Brad King 15f0da341f ci: Enable IPO and FindOpenGL tests on Windows+MSVC+Ninja
These are expected to work under a normal VS installation.
2021-02-18 08:31:29 -05:00
Brad King 430224b6e8 gitlab-ci: add test:debian10-aarch64-ninja job 2021-01-27 11:59:54 -05:00
Brad King d997637fa3 gitlab-ci: add rules infrastructure to allow non-MR jobs 2021-01-27 11:59:30 -05:00
Brad King 616bf0d2f0 gitlab-ci: consolidate release and package job infrastructure
Use `linux_release` in names associated with building or testing
release-style binaries.  Add a `.linux_package` helper to adjust
the release binary build behavior for package-specific jobs.
2021-01-27 10:29:38 -05:00
Brad King 227ca689a7 ci: download cmake on aarch64 2021-01-27 10:29:38 -05:00
Brad King a601ed8e0e ci: download ninja on aarch64 2021-01-27 10:29:38 -05:00
Brad King 54c2c5f889 ci: generalize ninja download script to support non-upstream builds 2021-01-27 10:29:38 -05:00
Brad King 88e049e327 ci: add docker spec to build ninja for linux-aarch64 2021-01-27 10:29:38 -05:00
Brad King eefa0ed0fa ci: update to use CMake 3.19.3 2021-01-27 10:20:46 -05:00
Brad King dc9340dbc4 Utilities/Release: Rename Linux packages to 'linux-$arch' 2021-01-25 13:53:40 -05:00
Brad King 34e5023682 Merge topic 'ci-wix-download'
127864aa9c Merge branch 'backport-3.18-ci-wix-download' into ci-wix-download
8efbb0c95f ci: download WiX on Windows
5e5fecb7bc ci: speed up cmake and ninja downloads on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5725
2021-01-21 13:01:20 -05:00
Brad King 127864aa9c Merge branch 'backport-3.18-ci-wix-download' into ci-wix-download 2021-01-21 12:20:54 -05:00
Brad King 8efbb0c95f ci: download WiX on Windows
Avoid requiring Windows CI hosts to have WiX installed.
2021-01-21 11:53:11 -05:00
Brad King 5e5fecb7bc ci: speed up cmake and ninja downloads on Windows
Invoke-WebRequest uses a progress bar by default, but we have no
interactive session anyway.  Turn it off to speed up downloads.
2021-01-21 11:49:49 -05:00
Brad King 2d4d9cd37a Merge branch 'backport-rel-macos-modern' into rel-macos-modern 2021-01-07 16:56:48 -05:00
Brad King 6410425e5b ci: build separate macOS packages for macOS 10.13+ and macOS 10.10+
In order to support modern macOS features like Dark Mode, we need to use
Qt 5.15, which requires macOS 10.13.  However, we still want to support
macOS 10.10 as well, for which we need to use Qt 5.9.  Build separate
macOS packages for these use cases.

Fixes: #21606
Issue: #20825
2021-01-07 16:56:05 -05:00
Brad King 3679b74a69 gitlab-ci: update upload jobs to go to cmake.org
Upload binaries to `cmake.org` through its own name rather than
through the `public.kitware.com` alias.
2021-01-07 16:09:28 -05:00
Brad King a24de5c59a Merge topic 'ci-xcode-12.3'
7b4a50d622 gitlab-ci: update macOS jobs to use Xcode 12.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5670
2021-01-06 13:49:32 -05:00
Brad King 7b4a50d622 gitlab-ci: update macOS jobs to use Xcode 12.3 2021-01-06 12:47:02 -05:00
Hi Key fe1bd15ad7 gitlab-ci: add jobs to make Linux release packages for aarch64 2020-12-22 14:05:17 -05:00
Brad King 24247155af Merge branch 'backport-rel-linux-aarch64' into rel-linux-aarch64 2020-12-22 14:04:59 -05:00
Hi Key 76742c4cbe gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branch 2020-12-22 14:04:39 -05:00
Brad King 595551a805 gitlab-ci: consolidate Linux release package job spec for x86_64 2020-12-22 14:04:39 -05:00
Brad King 8cb2506afb Merge topic 'rel-macos-apple-silicon'
23de430545 Utilities/Release: Update macOS Qt 5.9 build for platform versioning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5615
2020-12-15 07:35:01 -05:00
Brad King 23de430545 Utilities/Release: Update macOS Qt 5.9 build for platform versioning
Backport the upstream Qt patch [1] to link Qt binaries using the
`-isysroot` flag instead of `-Wl,-syslibroot`.  This is needed so that
the binaries have a SDK version set, which is needed for runtime
validation on modern macOS versions.

[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6387138a7991b4588639dc48847f175b5afaff84
2020-12-14 11:33:30 -05:00
Brad King fd6c1e5a73 Merge topic 'rel-macos-apple-silicon'
56a075eb5d ci: update macOS package to produce universal binaries
b184cc256b ci: do not use sccache for macOS packaging
41bddf1028 ci: update to pre-built Qt 5.9.9 universal binaries for macOS packages
b201dc0d42 Utilities/Release: Add script to build Qt 5.9.9 macOS universal binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5595
2020-12-10 12:05:17 -05:00
Brad King 56a075eb5d ci: update macOS package to produce universal binaries
Update our deployment target to macOS 10.10.
This is required by Qt 5.9.

Fixes: #21565
Issue: #20825
2020-12-10 10:55:17 -05:00
Brad King b184cc256b ci: do not use sccache for macOS packaging
It is not compatible with building for multiple architectures.
2020-12-10 10:53:59 -05:00
Brad King 41bddf1028 ci: update to pre-built Qt 5.9.9 universal binaries for macOS packages 2020-12-10 10:09:29 -05:00
Brad King 419adf0eef Merge topic 'test-macos-version'
55193c8013 ci: Hard-code XCTest deployment target to 10.15
40877903ac Tests: Remove outdated exclusion of tests on OS X 10.3
c404d7f221 Tests: Add cache entry to control XCTest deployment target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5593
2020-12-10 06:57:54 -05:00
Brad King 55193c8013 ci: Hard-code XCTest deployment target to 10.15
Avoid using the macOS version running on the CI job host that happens
to run the build job.
2020-12-09 13:28:52 -05:00
Brad King 5d49943504 Merge topic 'ninja-regen-metadata'
73d1c78bf4 ci: update to use ninja 1.10.2
11f4259362 Ninja: Clean metadata after regen during build on Windows with 1.10.2+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5555
2020-12-01 09:29:12 -05:00
Brad King 73d1c78bf4 ci: update to use ninja 1.10.2 2020-11-30 15:02:10 -05:00