Skip to content

Commit 8b0c24a

Browse files
committed
chore: synchronised with TypeScript-Demo-Lib-Native
1 parent f05d859 commit 8b0c24a

File tree

6 files changed

+1445
-2313
lines changed

6 files changed

+1445
-2313
lines changed

.gitlab-ci.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ check:test-generate:
9090
paths:
9191
- ./tmp/check-test.yml
9292
rules:
93-
# Runs on staging commits and ignores version commits
93+
# Runs on feature commits and ignores version commits
9494
- if: $CI_COMMIT_BRANCH =~ /^feature.*$/ && $CI_COMMIT_TITLE !~ /^[0-9]+\.[0-9]+\.[0-9]+(?:-.*[0-9]+)?$/
9595
# Manually run on commits other than master and staging and ignore version commits
9696
- if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH !~ /^(?:master|staging)$/ && $CI_COMMIT_TITLE !~ /^[0-9]+\.[0-9]+\.[0-9]+(?:-.*[0-9]+)?$/
@@ -100,15 +100,17 @@ check:test:
100100
stage: check
101101
needs:
102102
- check:test-generate
103-
inherit:
104-
variables: false
105103
trigger:
106104
include:
107105
- artifact: tmp/check-test.yml
108106
job: check:test-generate
109107
strategy: depend
108+
inherit:
109+
variables: false
110+
variables:
111+
PARENT_PIPELINE_ID: $CI_PIPELINE_ID
110112
rules:
111-
# Runs on staging commits and ignores version commits
113+
# Runs on feature commits and ignores version commits
112114
- if: $CI_COMMIT_BRANCH =~ /^feature.*$/ && $CI_COMMIT_TITLE !~ /^[0-9]+\.[0-9]+\.[0-9]+(?:-.*[0-9]+)?$/
113115
# Manually run on commits other than master and staging and ignore version commits
114116
- if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH !~ /^(?:master|staging)$/ && $CI_COMMIT_TITLE !~ /^[0-9]+\.[0-9]+\.[0-9]+(?:-.*[0-9]+)?$/
@@ -182,13 +184,15 @@ build:platforms:
182184
stage: build
183185
needs:
184186
- build:platforms-generate
185-
inherit:
186-
variables: false
187187
trigger:
188188
include:
189189
- artifact: tmp/build-platforms.yml
190190
job: build:platforms-generate
191191
strategy: depend
192+
inherit:
193+
variables: false
194+
variables:
195+
PARENT_PIPELINE_ID: $CI_PIPELINE_ID
192196
rules:
193197
# Runs on staging commits and ignores version commits
194198
- if: $CI_COMMIT_BRANCH == 'staging' && $CI_COMMIT_TITLE !~ /^[0-9]+\.[0-9]+\.[0-9]+(?:-.*[0-9]+)?$/
@@ -443,8 +447,6 @@ integration:merge:
443447
stage: integration
444448
needs:
445449
- build:merge
446-
- job: build:dist
447-
optional: true
448450
- job: build:platforms
449451
optional: true
450452
- job: integration:nix

0 commit comments

Comments
 (0)