From 44206134b2509d8906073d9b9b16d4dfdedb55e3 Mon Sep 17 00:00:00 2001 From: Kevin Meinhardt Date: Tue, 27 Aug 2024 12:43:42 +0200 Subject: [PATCH] Remove Circle CI configs (#22595) --- .circleci/config.yml | 116 ------------------------- README.md | 9 +- scripts/autograph_localdev_config.yaml | 3 - 3 files changed, 2 insertions(+), 126 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 942b1fd3aa..0000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,116 +0,0 @@ -# These environment variables must be set in CircleCI UI -# -# DOCKERHUB_REPO - docker hub repo, format: / -# DOCKER_USER - Login user for docker hub -# DOCKER_PASS - Login password for docker hub user -version: 2.1 - -references: - defaults-release: &defaults-release - machine: - image: ubuntu-2004:current - working_directory: "~/addons-server" - -commands: - make_release: - description: "Builds and pushes a Docker image" - parameters: - push: - type: boolean - default: false - image_tag: - type: string - default: "latest" - steps: - - run: - name: Set environment variables - command: | - echo 'export DOCKER_VERSION=<< parameters.image_tag >>' >> $BASH_ENV - echo 'export DOCKER_COMMIT=$CIRCLE_SHA1' >> $BASH_ENV - echo 'export DOCKER_BUILD=$CIRCLE_BUILD_URL' >> $BASH_ENV - echo 'export BUILDX_BAKE_METADATA_FILE=metadata.json' >> $BASH_ENV - echo 'export DOCKER_PROGRESS=plain' >> $BASH_ENV - - when: - condition: << parameters.push >> - steps: - - run: - name: Push mode activated - command: | - # CircleCI casts boolean paramters as binary 0/1 integers - # when they are passed via environment: variables. - # CircleCI will not reasonably work with conditional expressions - - # Our Makefile is expecting any non-empty value to indicate a push. - # So we must explicitly set the value - # only if the "condition" passes at the configuration level - echo 'export DOCKER_PUSH=true' >> $BASH_ENV - - run: - name: Create .env and version.json files - command: | - # We must defined a .env file for the docker-compose config - # The values will be inferred by what is set in the bash env above. - make -f Makefile-os setup - - run: - name: Docker build config - command: | - make docker_compose_config - cat $BASH_ENV - - run: - name: Build docker image (push = << parameters.push >>) - command: | - docker version - docker login -u "${DOCKERHUB_USER}" -p "${DOCKERHUB_PASS}" - make -f Makefile-os build_docker_image - - when: - condition: << parameters.push >> - steps: - - run: - name: Print Digest - command: | - cat ${BUILDX_BAKE_METADATA_FILE} | jq -r '.web."containerimage.digest"' - -jobs: - # Add to a workflow, if you want to test the docker build in circleci - build-image: - <<: *defaults-release - steps: - - checkout - - make_release: - image_tag: circle-${CIRCLE_BRANCH} - # explicitly don't push - push: false - - release-master: - <<: *defaults-release - steps: - - checkout - - make_release: - image_tag: latest - push: true - - release-tag: - <<: *defaults-release - steps: - - checkout - - make_release: - image_tag: "${CIRCLE_TAG}" - push: true - -workflows: - version: 2 - default-workflow: - jobs: - # Uncomment if you want to test the docker build - # - build-image - - release-master: - filters: - branches: - only: master - tags: - ignore: /.*/ - - release-tag: - filters: - tags: - only: /.*/ - branches: - ignore: /.*/ diff --git a/README.md b/README.md index eca0503210..ff8d201247 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,6 @@ -```{image} https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg -:alt: Code of conduct -:target: https://github.com/mozilla/addons-server/blob/master/.github/CODE_OF_CONDUCT.md -``` +[![Code of conduct](https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg)](https://github.com/mozilla/addons-server/blob/master/.github/CODE_OF_CONDUCT.md) -```{image} https://circleci.com/gh/mozilla/addons-server.svg?style=svg -:target: https://circleci.com/gh/mozilla/addons-server -``` +[![CI Status](https://github.com/mozilla/addons-server/actions/workflows/ci.yml/badge.svg)](https://github.com/mozilla/addons-server/actions/workflows/ci.yml) # Addons-Server diff --git a/scripts/autograph_localdev_config.yaml b/scripts/autograph_localdev_config.yaml index 4e53ac6f09..4786a86edb 100644 --- a/scripts/autograph_localdev_config.yaml +++ b/scripts/autograph_localdev_config.yaml @@ -1,8 +1,5 @@ # Note (1): Most of the configuration here got copied from # https://github.com/mozilla-services/autograph/blob/master/autograph.yaml -# -# Note (2): the content of the file is also embedded in `.circleci/config.yml`. -# Any change here should likely be duplicated. server: # This port should be perfectly free, the upstream default of 8000