Merge remote-tracking branch 'refs/remotes/origin/master_21.275' into dev
# Conflicts: # clearing-parent/account-service/pom.xml # clearing-parent/backend-api/pom.xml # clearing-parent/balance-service/pom.xml # clearing-parent/classes/pom.xml # clearing-parent/cleaning-builders/pom.xml # clearing-parent/clearing-service/pom.xml # clearing-parent/clearing-validation/pom.xml # clearing-parent/company-service/pom.xml # clearing-parent/db-scripts/pom.xml # clearing-parent/dbf-exporter/pom.xml # clearing-parent/dbf-importer/pom.xml # clearing-parent/dictionary/pom.xml # clearing-parent/extdb-importer/pom.xml # clearing-parent/gateway-api/pom.xml # clearing-parent/imdg-hist/pom.xml # clearing-parent/imdg/pom.xml # clearing-parent/lim-exporter/pom.xml # clearing-parent/pom.xml # clearing-parent/registry-service/pom.xml # clearing-parent/reports-service/pom.xml # clearing-parent/scheduler-service/pom.xml # clearing-parent/securities-service/pom.xml # clearing-parent/security-util/pom.xml # clearing-parent/swt-exporter/pom.xml # clearing-parent/swt-importer/pom.xml # clearing-parent/test-clearing/pom.xml # clearing-parent/trade-importer/pom.xml # clearing-parent/utility-service/pom.xml # clearing-parent/xml-exporter/pom.xml # clearing-parent/xml-importer/pom.xml # platform-parent/pom.xml # pom.xml # z-distr/pom.xml
This commit is contained in:
commit
4c2f485116
1 changed files with 3 additions and 0 deletions
|
|
@ -26,6 +26,7 @@ preflight:
|
|||
- clearing_test
|
||||
only:
|
||||
- master
|
||||
- /^master_.*$/
|
||||
- dev
|
||||
- /^dev_.*$/
|
||||
- new
|
||||
|
|
@ -43,6 +44,7 @@ build:
|
|||
- /builds/mfd/clearing/z-distr/target/clearing
|
||||
only:
|
||||
- master
|
||||
- /^master_.*$/
|
||||
- dev
|
||||
- /^dev_.*$/
|
||||
- new
|
||||
|
|
@ -70,6 +72,7 @@ test:
|
|||
- artifacts/logs
|
||||
only:
|
||||
- master
|
||||
- /^master_.*$/
|
||||
- dev
|
||||
- /^dev_.*$/
|
||||
- new
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue