Commit 4fd57b4c authored by Dridi Boukelmoune's avatar Dridi Boukelmoune

circleci: Rename distcheck jobs to build

And rename the "check" parameter to "make_target" to avoid ambiguity.

Better diff with the --word-diff --word-diff-regex=[a-z]+ options.
parent be24b075
...@@ -198,7 +198,7 @@ jobs: ...@@ -198,7 +198,7 @@ jobs:
root: . root: .
paths: paths:
- "packages" - "packages"
distcheck: build:
parameters: parameters:
prefix: prefix:
description: the container image prefix (repository or architecture) description: the container image prefix (repository or architecture)
...@@ -210,8 +210,8 @@ jobs: ...@@ -210,8 +210,8 @@ jobs:
release: release:
description: the release name (stretch|buster|bionic|focal) description: the release name (stretch|buster|bionic|focal)
type: string type: string
check: make_target:
description: the check to perform during the build description: the make target to execute during the build
default: distcheck default: distcheck
type: string type: string
extra_conf: extra_conf:
...@@ -229,7 +229,7 @@ jobs: ...@@ -229,7 +229,7 @@ jobs:
command: yum install -y docker command: yum install -y docker
- checkout - checkout
- run: - run:
name: Extract and distcheck name: Extract and build
command: | command: |
docker create --name workspace -v /workspace << parameters.prefix >><< parameters.dist >>:<< parameters.release >> /bin/true docker create --name workspace -v /workspace << parameters.prefix >><< parameters.dist >>:<< parameters.release >> /bin/true
docker cp /workspace workspace:/ docker cp /workspace workspace:/
...@@ -347,7 +347,7 @@ jobs: ...@@ -347,7 +347,7 @@ jobs:
<< parameters.extra_conf >> << parameters.extra_conf >>
sudo -u varnish \ sudo -u varnish \
--preserve-env=ASAN_OPTIONS,LSAN_OPTIONS,TSAN_OPTIONS,UBSAN_OPTIONS \ --preserve-env=ASAN_OPTIONS,LSAN_OPTIONS,TSAN_OPTIONS,UBSAN_OPTIONS \
make << parameters.check >> VERBOSE=1 -j 4 -k \ make << parameters.make_target >> VERBOSE=1 -j 4 -k \
DISTCHECK_CONFIGURE_FLAGS="<< pipeline.parameters.configure_args >> \ DISTCHECK_CONFIGURE_FLAGS="<< pipeline.parameters.configure_args >> \
<< parameters.extra_conf >>" << parameters.extra_conf >>"
' '
...@@ -376,60 +376,60 @@ workflows: ...@@ -376,60 +376,60 @@ workflows:
- << pipeline.parameters.build-pkgs >> - << pipeline.parameters.build-pkgs >>
- << pipeline.parameters.dist-url >> - << pipeline.parameters.dist-url >>
jobs: jobs:
- distcheck: - build:
name: distcheck_centos_7 name: build_centos_7
dist: centos dist: centos
release: "7" release: "7"
- distcheck: - build:
name: distcheck_centos_stream name: build_centos_stream
prefix: quay.io/centos/ prefix: quay.io/centos/
dist: centos dist: centos
release: stream release: stream
- distcheck: - build:
name: distcheck_almalinux_8 name: build_almalinux_8
dist: almalinux dist: almalinux
release: "8" release: "8"
# fedora is our witness # fedora is our witness
- distcheck: - build:
name: distcheck_fedora_latest name: build_fedora_latest
dist: fedora dist: fedora
release: latest release: latest
check: witness make_target: witness
- distcheck: - build:
name: distcheck_fedora_rawhide name: build_fedora_rawhide
dist: fedora dist: fedora
release: rawhide release: rawhide
# latest debian uses sanitizers # latest debian uses sanitizers
- distcheck: - build:
name: distcheck_debian_buster name: build_debian_buster
dist: debian dist: debian
release: buster release: buster
- distcheck: - build:
name: distcheck_debian_bullseye name: build_debian_bullseye
dist: debian dist: debian
release: bullseye release: bullseye
extra_conf: --enable-asan --enable-ubsan --enable-workspace-emulator extra_conf: --enable-asan --enable-ubsan --enable-workspace-emulator
# oldest ubuntu goes 32bit # oldest ubuntu goes 32bit
- distcheck: - build:
name: distcheck_ubuntu_bionic name: build_ubuntu_bionic
prefix: i386/ prefix: i386/
dist: ubuntu dist: ubuntu
release: bionic release: bionic
- distcheck: - build:
name: distcheck_ubuntu_focal name: build_ubuntu_focal
dist: ubuntu dist: ubuntu
release: focal release: focal
- distcheck: - build:
name: distcheck_ubuntu_jammy name: build_ubuntu_jammy
dist: ubuntu dist: ubuntu
release: jammy release: jammy
- distcheck: - build:
name: distcheck_alpine name: build_alpine
dist: alpine dist: alpine
release: "latest" release: "latest"
#extra_conf: --without-jemalloc #extra_conf: --without-jemalloc
- distcheck: - build:
name: distcheck_archlinux name: build_archlinux
dist: archlinux dist: archlinux
release: base-devel release: base-devel
packaging: packaging:
......
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