summaryrefslogtreecommitdiffstats
path: root/.gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'ci-wix-download'Brad King2021-01-214-0/+23
|\
| * Merge branch 'backport-3.18-ci-wix-download' into ci-wix-downloadBrad King2021-01-214-0/+23
| |\
| | * ci: download WiX on WindowsBrad King2021-01-212-0/+21
| | * ci: speed up cmake and ninja downloads on WindowsBrad King2021-01-212-0/+2
| | * gitlab-ci: update macOS jobs to use Xcode 11.7Brad King2020-09-171-3/+3
* | | Merge branch 'backport-rel-macos-modern' into rel-macos-modernBrad King2021-01-078-29/+48
|\ \ \ | |/ /
| * | ci: build separate macOS packages for macOS 10.13+ and macOS 10.10+Brad King2021-01-077-28/+47
| * | gitlab-ci: update upload jobs to go to cmake.orgBrad King2021-01-071-1/+1
* | | Merge topic 'ci-xcode-12.3'Brad King2021-01-061-4/+4
|\ \ \ | |/ /
| * | gitlab-ci: update macOS jobs to use Xcode 12.3Brad King2021-01-061-4/+4
| * | gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branchHi Key2020-12-223-7/+30
* | | gitlab-ci: add jobs to make Linux release packages for aarch64Hi Key2020-12-223-7/+30
* | | Merge branch 'backport-rel-linux-aarch64' into rel-linux-aarch64Brad King2020-12-221-7/+2
|\ \ \ | |/ /
| * | gitlab-ci: consolidate Linux release package job spec for x86_64Brad King2020-12-221-7/+2
* | | Merge topic 'rel-macos-apple-silicon'Brad King2020-12-151-1/+1
|\ \ \ | |/ /
| * | Utilities/Release: Update macOS Qt 5.9 build for platform versioningBrad King2020-12-141-1/+1
* | | Merge topic 'rel-macos-apple-silicon'Brad King2020-12-106-13/+14
|\ \ \ | |/ /
| * | ci: update macOS package to produce universal binariesBrad King2020-12-102-4/+4
| * | ci: do not use sccache for macOS packagingBrad King2020-12-103-6/+7
| * | ci: update to pre-built Qt 5.9.9 universal binaries for macOS packagesBrad King2020-12-102-3/+3
* | | Merge topic 'test-macos-version'Brad King2020-12-101-0/+5
|\ \ \ | |/ /
| * | ci: Hard-code XCTest deployment target to 10.15Brad King2020-12-091-0/+5
* | | Merge topic 'ninja-regen-metadata'Brad King2020-12-012-5/+5
|\ \ \ | |/ /
| * | ci: update to use ninja 1.10.2Brad King2020-11-302-5/+5
| * | Merge topic 'ci-xcode-12.2' into release-3.19Brad King2020-11-251-4/+4
| |\ \
* | \ \ Merge topic 'ci-xcode-12.2'Brad King2020-11-251-4/+4
|\ \ \ \ | | |/ / | |/| |
| * | | gitlab-ci: update macOS jobs to use Xcode 12.2Brad King2020-11-241-4/+4
* | | | Merge topic 'test-java-default'Brad King2020-11-251-3/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Tests: Add CMake_TEST_Java option to control Java testsBrad King2020-11-241-3/+1
| |/ /
* | | Merge topic 'ci-updates'Brad King2020-11-183-9/+9
|\ \ \ | |/ /
| * | gitlab-ci: update macOS jobs to use Xcode 12.0Brad King2020-11-181-4/+4
| * | ci: update to use CMake 3.19.0Brad King2020-11-182-5/+5
* | | Merge topic 'gitlab-ci-msvc-14.28'Brad King2020-11-171-4/+4
|\ \ \ | |/ /
| * | gitlab-ci: Update Windows builds to MSVC 19.28Brad King2020-11-171-4/+4
* | | Merge branch 'ci-fedora33-release' into ci-fedora33Ben Boeckel2020-11-1314-27/+30
|\ \ \ | |/ /
| * | gitlab-ci: use Fedora 33 to build sourcesBen Boeckel2020-11-131-1/+1
| * | gitlab-ci: update Linux CI to use Fedora 33Ben Boeckel2020-11-1310-24/+24
| * | ci: update to Fedora 33 for Linux buildsBen Boeckel2020-11-134-2/+5
| * | ci: install gmock in the Fedora 31 imageBrad King2020-11-132-1/+3
* | | Merge topic 'ci-config-sync'Brad King2020-10-274-21/+14
|\ \ \ | |/ /
| * | ci: update to Qt 5.15.1Ben Boeckel2020-10-272-16/+9
| * | ci: update to use CMake 3.18.4Ben Boeckel2020-10-272-5/+5
| * | Merge topic 'cmakepresets-schema' into release-3.19Kyle Edwards2020-10-213-1/+3
| |\ \
* | | | ci: install gmock in the Fedora 31 imageBrad King2020-10-222-1/+3
* | | | Merge topic 'cmakepresets-schema'Kyle Edwards2020-10-213-1/+3
|\ \ \ \
| * \ \ \ Merge branch 'master' into cmakepresets-schemaKyle Edwards2020-10-203-1/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | CI: Install jsonschema for schema testingKyle Edwards2020-10-203-1/+3
* | | | | Merge topic 'ci-win-python'Brad King2020-10-202-0/+44
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | ci: add Python to PATH on WindowsBrad King2020-10-202-0/+44
| |/ /
* | | Merge topic 'sccache-macos-without-timeouts'Brad King2020-10-191-4/+12
|\ \ \ | |/ /