Skip to content

Commit dc9b4ef

Browse files
committed
CircleCI: support for intergration branches (#567)
(cherry picked from commit 80bf0eb)
1 parent 5fe2ac7 commit dc9b4ef

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

.circleci/config.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,17 @@ on-master: &on-master
336336
filters:
337337
branches:
338338
only: master
339+
tags:
340+
ignore: /.*/
341+
342+
on-integ-branch: &on-integ-branch
343+
filters:
344+
branches:
345+
only:
346+
- master
347+
- /^\d+\.\d+.*$/
348+
tags:
349+
ignore: /.*/
339350

340351
on-version-tags: &on-version-tags
341352
filters:
@@ -344,18 +355,20 @@ on-version-tags: &on-version-tags
344355
tags:
345356
only: /^v[0-9].*/
346357

347-
on-master-and-version-tags: &on-master-and-version-tags
358+
on-integ-and-version-tags: &on-integ-and-version-tags
348359
filters:
349360
branches:
350361
only:
351362
- master
363+
- /^\d+\.\d+.*$/
352364
tags:
353365
only: /^v[0-9].*/
354366

367+
355368
platform-build-defs: &platform-build-defs
356369
requires:
357370
- build-debian
358-
<<: *on-master-and-version-tags
371+
<<: *on-integ-and-version-tags
359372
# <<: *on-any-branch # debugging
360373

361374
after-platform-builds: &after-platform-builds
@@ -405,7 +418,7 @@ workflows:
405418
# <<: *on-version-tags
406419
- deploy-snapshot:
407420
<<: *after-platform-builds
408-
<<: *on-master
421+
<<: *on-integ-branch
409422
- deploy-release:
410423
<<: *after-platform-builds
411424
<<: *on-version-tags
@@ -414,7 +427,9 @@ workflows:
414427
triggers:
415428
- schedule:
416429
cron: "20 17 * * *"
417-
<<: *on-master
430+
filters:
431+
branches:
432+
only: master
418433
jobs:
419434
- build-macos:
420435
<<: *never # temporarily disabled

0 commit comments

Comments
 (0)