diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-07-12 13:56:23 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-07-12 13:56:23 +0200 |
| commit | 90a03391d73034645b85be0d622d5f17d080ebae (patch) | |
| tree | a7e65421be856db997f73353c31d56ad3c69463d /coin | |
| parent | d1dbff3e6ff6da7b580f81ce4d0e9fce3acf5eff (diff) | |
| parent | 894a62325a090fe50b19391f39f088c4ba4a29d5 (diff) | |
| download | qt-creator-90a03391d73034645b85be0d622d5f17d080ebae.tar.gz | |
Merge remote-tracking branch 'origin/8.0'
Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/build.yaml | 2 | ||||
| -rw-r--r-- | coin/instructions/test.yaml | 6 | ||||
| -rw-r--r-- | coin/module_config.yaml | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml index f9219f1dd3..a4bd50a059 100644 --- a/coin/instructions/build.yaml +++ b/coin/instructions/build.yaml @@ -148,7 +148,7 @@ instructions: equals_value: Windows - type: UploadArtifact - archiveDirectory: "{{.AgentWorkingDir}}" + archiveDirectory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build" transferType: UploadModuleBuildArtifact maxTimeInSeconds: 1800 maxTimeBetweenOutput: 1800 diff --git a/coin/instructions/test.yaml b/coin/instructions/test.yaml index 1cbd4fd16d..26b211d1ef 100644 --- a/coin/instructions/test.yaml +++ b/coin/instructions/test.yaml @@ -1,5 +1,11 @@ type: Group instructions: + - type: InstallBinaryArchive + relativeStoragePath: "{{.Env.MODULE_ARTIFACTS_RELATIVE_STORAGE_PATH}}/artifacts.tar.gz" + directory: "qt-creator/qt-creator_build/build" + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 1800 + userMessageOnFailure: "Failed to unarchive build artifacts, check logs" - type: ChangeDirectory directory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build" - type: ExecuteCommand diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 3bd2ef9113..96428853f2 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -66,6 +66,7 @@ make_instructions: &make_instructions test_instructions: &test_instructions type: Group instructions: + - !include "{{qt-creator/qt-creator}}/provision.yaml" - !include "{{qt-creator/qt-creator}}/test.yaml" instructions: @@ -74,6 +75,7 @@ instructions: - *make_instructions Test: + - *common_environment - *test_instructions LicenseCheck: |