diff --git a/.circleci/config.yml b/.circleci/config.yml index 153b29089..8aa459583 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,82 +15,64 @@ workflows: ci: jobs: # Start with jobs testing various platforms. - - # 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-9": + {} - "debian-10": - <<: *DOCKERHUB_CONTEXT requires: - "debian-9" - "ubuntu-20-04": - <<: *DOCKERHUB_CONTEXT + {} - "ubuntu-18-04": - <<: *DOCKERHUB_CONTEXT requires: - "ubuntu-20-04" - "ubuntu-16-04": - <<: *DOCKERHUB_CONTEXT requires: - "ubuntu-20-04" - "fedora-29": - <<: *DOCKERHUB_CONTEXT + {} - "fedora-28": - <<: *DOCKERHUB_CONTEXT requires: - "fedora-29" - "centos-8": - <<: *DOCKERHUB_CONTEXT + {} - "nixos-19-09": - <<: *DOCKERHUB_CONTEXT + {} # Test against PyPy 2.7 - "pypy27-buster": - <<: *DOCKERHUB_CONTEXT + {} # Just one Python 3.6 configuration while the port is in-progress. - "python36": - <<: *DOCKERHUB_CONTEXT + {} # Other assorted tasks and configurations - "lint": - <<: *DOCKERHUB_CONTEXT + {} - "pyinstaller": - <<: *DOCKERHUB_CONTEXT + {} - "deprecations": - <<: *DOCKERHUB_CONTEXT + {} - "c-locale": - <<: *DOCKERHUB_CONTEXT + {} # Any locale other than C or UTF-8. - "another-locale": - <<: *DOCKERHUB_CONTEXT + {} - "integration": - <<: *DOCKERHUB_CONTEXT requires: # If the unit test suite doesn't pass, don't bother running the # integration tests. - "debian-9" - "typechecks": - <<: *DOCKERHUB_CONTEXT - + {} - "docs": - <<: *DOCKERHUB_CONTEXT + {} images: # Build the Docker images used by the ci jobs. This makes the ci jobs @@ -105,8 +87,16 @@ workflows: - "master" jobs: - - "build-image-debian-10": - <<: *DOCKERHUB_CONTEXT + # Every job that pushes a Docker image from Docker Hub needs to provide + # 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": <<: *DOCKERHUB_CONTEXT - "build-image-ubuntu-16-04": diff --git a/newsfragments/3759.minor b/newsfragments/3759.minor new file mode 100644 index 000000000..e69de29bb