Commit af1ea17b authored by Martin Blix Grydeland's avatar Martin Blix Grydeland

Tweak the CircleCI config to be master/release branch agnostic

parent 855b3c7c
...@@ -21,6 +21,10 @@ parameters: ...@@ -21,6 +21,10 @@ parameters:
--enable-debugging-symbols \ --enable-debugging-symbols \
--disable-stack-protector \ --disable-stack-protector \
--with-persistent-storage \ --with-persistent-storage \
build-pkgs:
type: string
default: ""
jobs: jobs:
dist: dist:
description: Build or download varnish-x.y.z.tar.gz that is used later for the packaging jobs description: Build or download varnish-x.y.z.tar.gz that is used later for the packaging jobs
...@@ -363,6 +367,10 @@ jobs: ...@@ -363,6 +367,10 @@ jobs:
workflows: workflows:
version: 2 version: 2
commit: commit:
unless: &packaging_cond
or:
- << pipeline.parameters.build-pkgs >>
- << pipeline.parameters.dist-url >>
jobs: jobs:
- distcheck: - distcheck:
name: distcheck_centos_7 name: distcheck_centos_7
...@@ -404,15 +412,9 @@ workflows: ...@@ -404,15 +412,9 @@ workflows:
name: distcheck_archlinux name: distcheck_archlinux
dist: archlinux dist: archlinux
release: base-devel release: base-devel
nightly: packaging:
triggers: when: *packaging_cond
- schedule: jobs: &packaging_jobs
cron: "0 4 * * *"
filters:
branches:
only:
- master
jobs:
- dist - dist
- tar_pkg_tools - tar_pkg_tools
- package: - package:
...@@ -439,3 +441,12 @@ workflows: ...@@ -439,3 +441,12 @@ workflows:
- collect_packages: - collect_packages:
requires: requires:
- package - package
nightly:
triggers:
- schedule:
cron: "0 4 * * *"
filters:
branches:
only:
- master
jobs: *packaging_jobs
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment