Skip to content

Commit 535437e

Browse files
author
Bastien Riviere
committed
Merge branch 'baba/refactor-deployed-native' into 'master'
refactor: create rules for check/deployed-native See merge request TankerHQ/sdk-rust!64
2 parents 3207776 + f8a4a7d commit 535437e

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

.gitlab-ci.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include:
22
project: TankerHQ/gitlab-ci-files
33
file: /rust.yml
4-
ref: 2021-09-02-1
4+
ref: 2021-10-04-177
55

66
check/native-from-sources/linux:
77
extends:
@@ -59,11 +59,17 @@ check/native-from-sources/ios/arm:
5959
script:
6060
- poetry run python run-ci.py --isolate-conan-user-home build-and-test --use-tanker=same-as-branch --profile ios-armv8-release --profile ios-simulator-armv8-release
6161

62+
.rules/check/deployed-native:
63+
rules:
64+
- !reference [.rules/web/auto, rules]
65+
- !reference [.rules/mr/manual, rules]
66+
- !reference [.rules/deploy-pipeline, rules]
67+
6268
check/deployed-native/linux:
6369
extends:
6470
- .check
6571
- .tags/linux
66-
- .rules/deployed-native/release-artifacts
72+
- .rules/check/deployed-native
6773
- .release-artifacts
6874
script:
6975
- poetry run python run-ci.py --isolate-conan-user-home build-and-test --use-tanker=deployed --tanker-ref=$SDK_NATIVE_LATEST_CONAN_REFERENCE --profile linux-release
@@ -72,7 +78,7 @@ check/deployed-native/windows:
7278
extends:
7379
- .check
7480
- .tags/windows
75-
- .rules/deployed-native/release-artifacts
81+
- .rules/check/deployed-native
7682
- .release-artifacts
7783
script:
7884
- poetry run python run-ci.py --isolate-conan-user-home build-and-test --use-tanker=deployed --tanker-ref=$SDK_NATIVE_LATEST_CONAN_REFERENCE --profile vs2019-release-shared
@@ -81,7 +87,7 @@ check/deployed-native/android:
8187
extends:
8288
- .check
8389
- .tags/linux
84-
- .rules/deployed-native/release-artifacts
90+
- .rules/check/deployed-native
8591
- .release-artifacts
8692
script:
8793
- poetry run python run-ci.py --isolate-conan-user-home build-and-test --use-tanker=deployed --tanker-ref=$SDK_NATIVE_LATEST_CONAN_REFERENCE --profile android-armv8-release-static --profile android-x86_64-release-static --profile android-x86-release-static --profile android-armv7-release-static
@@ -90,7 +96,7 @@ check/deployed-native/macos/x86_64:
9096
extends:
9197
- .check
9298
- .tags/macos/x86_64
93-
- .rules/deployed-native/release-artifacts
99+
- .rules/check/deployed-native
94100
- .release-artifacts
95101
script:
96102
- poetry run python run-ci.py --isolate-conan-user-home build-and-test --use-tanker=deployed --tanker-ref=$SDK_NATIVE_LATEST_CONAN_REFERENCE --profile macos-x86_64-release
@@ -99,7 +105,7 @@ check/deployed-native/macos/arm:
99105
extends:
100106
- .check
101107
- .tags/macos/arm
102-
- .rules/deployed-native/release-artifacts
108+
- .rules/check/deployed-native
103109
- .release-artifacts
104110
script:
105111
- poetry run python run-ci.py --isolate-conan-user-home build-and-test --use-tanker=deployed --tanker-ref=$SDK_NATIVE_LATEST_CONAN_REFERENCE --profile macos-armv8-release
@@ -108,7 +114,7 @@ check/deployed-native/ios/x86_64:
108114
extends:
109115
- .check
110116
- .tags/macos/x86_64
111-
- .rules/deployed-native/release-artifacts
117+
- .rules/check/deployed-native
112118
- .release-artifacts
113119
script:
114120
- poetry run python run-ci.py --isolate-conan-user-home build-and-test --use-tanker=deployed --tanker-ref=$SDK_NATIVE_LATEST_CONAN_REFERENCE --profile ios-armv8-release --profile ios-simulator-x86_64-release
@@ -117,7 +123,7 @@ check/deployed-native/ios/arm:
117123
extends:
118124
- .check
119125
- .tags/macos/arm
120-
- .rules/deployed-native/release-artifacts
126+
- .rules/check/deployed-native
121127
- .release-artifacts
122128
script:
123129
- poetry run python run-ci.py --isolate-conan-user-home build-and-test --use-tanker=deployed --tanker-ref=$SDK_NATIVE_LATEST_CONAN_REFERENCE --profile ios-armv8-release --profile ios-simulator-armv8-release

0 commit comments

Comments
 (0)