Merge remote-tracking branch 'origin/master' into 3760.run-codechecks3

This commit is contained in:
Jean-Paul Calderone 2021-08-11 10:25:13 -04:00
commit 6e89713b65
2 changed files with 25 additions and 35 deletions

View File

@ -15,82 +15,64 @@ workflows:
ci: ci:
jobs: jobs:
# Start with jobs testing various platforms. # Start with jobs testing various platforms.
- "debian-9":
# Every job that pulls a Docker image from Docker Hub needs to provide {}
# credentials for that pull operation to avoid being subjected to
# unauthenticated pull limits shared across all of CircleCI. Use this
# first job to define a yaml anchor that can be used to supply a
# CircleCI job context which makes Docker Hub credentials available in
# the environment.
#
# Contexts are managed in the CircleCI web interface:
#
# https://app.circleci.com/settings/organization/github/tahoe-lafs/contexts
- "debian-9": &DOCKERHUB_CONTEXT
context: "dockerhub-auth"
- "debian-10": - "debian-10":
<<: *DOCKERHUB_CONTEXT
requires: requires:
- "debian-9" - "debian-9"
- "ubuntu-20-04": - "ubuntu-20-04":
<<: *DOCKERHUB_CONTEXT {}
- "ubuntu-18-04": - "ubuntu-18-04":
<<: *DOCKERHUB_CONTEXT
requires: requires:
- "ubuntu-20-04" - "ubuntu-20-04"
- "ubuntu-16-04": - "ubuntu-16-04":
<<: *DOCKERHUB_CONTEXT
requires: requires:
- "ubuntu-20-04" - "ubuntu-20-04"
- "fedora-29": - "fedora-29":
<<: *DOCKERHUB_CONTEXT {}
- "fedora-28": - "fedora-28":
<<: *DOCKERHUB_CONTEXT
requires: requires:
- "fedora-29" - "fedora-29"
- "centos-8": - "centos-8":
<<: *DOCKERHUB_CONTEXT {}
- "nixos-19-09": - "nixos-19-09":
<<: *DOCKERHUB_CONTEXT {}
# Test against PyPy 2.7 # Test against PyPy 2.7
- "pypy27-buster": - "pypy27-buster":
<<: *DOCKERHUB_CONTEXT {}
# Just one Python 3.6 configuration while the port is in-progress. # Just one Python 3.6 configuration while the port is in-progress.
- "python36": - "python36":
<<: *DOCKERHUB_CONTEXT {}
# Other assorted tasks and configurations # Other assorted tasks and configurations
- "lint": - "lint":
<<: *DOCKERHUB_CONTEXT {}
- "pyinstaller": - "pyinstaller":
<<: *DOCKERHUB_CONTEXT {}
- "deprecations": - "deprecations":
<<: *DOCKERHUB_CONTEXT {}
- "c-locale": - "c-locale":
<<: *DOCKERHUB_CONTEXT {}
# Any locale other than C or UTF-8. # Any locale other than C or UTF-8.
- "another-locale": - "another-locale":
<<: *DOCKERHUB_CONTEXT {}
- "integration": - "integration":
<<: *DOCKERHUB_CONTEXT
requires: requires:
# If the unit test suite doesn't pass, don't bother running the # If the unit test suite doesn't pass, don't bother running the
# integration tests. # integration tests.
- "debian-9" - "debian-9"
- "typechecks": - "typechecks":
<<: *DOCKERHUB_CONTEXT {}
- "docs": - "docs":
<<: *DOCKERHUB_CONTEXT {}
images: images:
# Build the Docker images used by the ci jobs. This makes the ci jobs # Build the Docker images used by the ci jobs. This makes the ci jobs
@ -105,8 +87,16 @@ workflows:
- "master" - "master"
jobs: jobs:
- "build-image-debian-10": # Every job that pushes a Docker image from Docker Hub needs to provide
<<: *DOCKERHUB_CONTEXT # credentials. Use this first job to define a yaml anchor that can be
# used to supply a CircleCI job context which makes Docker Hub
# credentials available in the environment.
#
# Contexts are managed in the CircleCI web interface:
#
# https://app.circleci.com/settings/organization/github/tahoe-lafs/contexts
- "build-image-debian-10": &DOCKERHUB_CONTEXT
context: "dockerhub-auth"
- "build-image-debian-9": - "build-image-debian-9":
<<: *DOCKERHUB_CONTEXT <<: *DOCKERHUB_CONTEXT
- "build-image-ubuntu-16-04": - "build-image-ubuntu-16-04":

0
newsfragments/3759.minor Normal file
View File