Skip to content

Commit b427ded

Browse files
committed
Merge branch 'jul/log-rust-versions' into 'master'
Log rustc and cargo version See merge request TankerHQ/sdk-rust!165
2 parents 1360b96 + 003d50c commit b427ded

File tree

1 file changed

+36
-32
lines changed

1 file changed

+36
-32
lines changed

.gitlab-ci.yml

+36-32
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,38 @@ workflow:
2727
variables:
2828
CONAN_REMOTE: "artifactory"
2929

30+
#################
31+
# Extend blocks #
32+
#################
33+
34+
.before-script/download-artifacts:
35+
before_script:
36+
- poetry run python run-ci.py download-artifacts --project-id=$UPSTREAM_PROJECT_ID --pipeline-id=$UPSTREAM_PIPELINE_ID --job-name=$UPSTREAM_JOB_NAME
37+
38+
.before-script/python:
39+
before_script:
40+
- poetry run python -m pip install --upgrade pip
41+
- poetry install
42+
43+
.before-script/rust:
44+
before_script:
45+
- cargo --version
46+
- rustc --version
47+
48+
.release-artifacts:
49+
artifacts:
50+
paths:
51+
- native/
52+
expire_in: 7 days
53+
3054
###########
3155
# Default #
3256
###########
3357

3458
default:
3559
before_script:
36-
- poetry run python -m pip install --upgrade pip
37-
- poetry install
60+
- !reference [.before-script/python, before_script]
61+
- !reference [.before-script/rust, before_script]
3862
image: registry.gitlab.com/tankerhq/docker/sdk-rust:latest
3963

4064
##########
@@ -47,26 +71,6 @@ stages:
4771
- bridge-check
4872
- deploy
4973

50-
#############################
51-
# Default settings override #
52-
#############################
53-
54-
.before-script/download-artifacts:
55-
before_script:
56-
- poetry run python -m pip install --upgrade pip
57-
- poetry install
58-
- poetry run python run-ci.py download-artifacts --project-id=$UPSTREAM_PROJECT_ID --pipeline-id=$UPSTREAM_PIPELINE_ID --job-name=$UPSTREAM_JOB_NAME
59-
60-
#################
61-
# Extend blocks #
62-
#################
63-
64-
.release-artifacts:
65-
artifacts:
66-
paths:
67-
- native/
68-
expire_in: 7 days
69-
7074
############
7175
# profiles #
7276
############
@@ -76,16 +80,17 @@ stages:
7680
TANKER_PROFILES: --profile linux-x86_64
7781

7882
.profiles/windows:
83+
extends:
84+
- .tags/windows
7985
before_script:
80-
- poetry run python -m pip install --upgrade pip
81-
- poetry install
86+
- !reference [default, before_script]
8287
# Powershell doesn't split env variable when expanding it.
8388
# So, we are using the native syntax to create an array, which will be correctly expanded.
8489
- $TANKER_PROFILES = "--profile", "windows-x86_64", "shared"
8590

8691
.profiles/windows/artifacts:
8792
extends:
88-
- .tags/windows
93+
- .profiles/windows
8994
before_script:
9095
- !reference [.profiles/windows, before_script]
9196
- !reference [.before-script/download-artifacts, before_script]
@@ -148,7 +153,6 @@ prepare/deployed/windows:
148153
extends:
149154
- .profiles/windows
150155
- .prepare
151-
tags: !reference [.tags/windows, tags]
152156

153157
prepare/deployed/android:
154158
extends:
@@ -267,7 +271,6 @@ check/deployed-native/windows:
267271
- .check/deployed-native
268272
needs:
269273
- prepare/deployed/windows
270-
tags: !reference [.tags/windows, tags]
271274

272275
check/deployed-native/android:
273276
extends:
@@ -307,8 +310,9 @@ check/deployed-native/ios/arm:
307310

308311
.check/downstream:
309312
stage: check
310-
extends:
311-
- .before-script/download-artifacts
313+
before_script:
314+
- !reference [default, before_script]
315+
- !reference [.before-script/download-artifacts, before_script]
312316
dependencies: []
313317
script:
314318
- poetry run python run-ci.py --isolate-conan-user-home --remote $CONAN_REMOTE prepare --use-tanker=upstream $TANKER_PROFILES
@@ -326,7 +330,6 @@ check/downstream/windows:
326330
- .rules/check/downstream/windows
327331
- .check/downstream
328332
- .profiles/windows/artifacts
329-
tags: !reference [.tags/windows, tags]
330333

331334
check/downstream/android:
332335
extends:
@@ -374,8 +377,9 @@ check/downstream/macos/arm:
374377
bridge-dotenv:
375378
stage: bridge-check
376379
inherit:
377-
default: # Skip docker image
378-
- "before_script"
380+
default: [] # Skip docker image
381+
before_script:
382+
- !reference [.before-script/python, before_script]
379383
rules:
380384
- !reference [ .rules/push-master-or-feat, rules ]
381385
- !reference [ .rules/check/downstream/ios-or-android, rules ]

0 commit comments

Comments
 (0)