diff --git a/.circleci/config.yml b/.circleci/config.yml index f4b80492c..e3bede3ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,28 +54,6 @@ aliases: cp /caches/container.tar.gz share/ cp /caches/image-id.txt share/ - - &deploy-packagecloud - command: | - VERSION=$(cat share/version.txt) - echo "PACKAGE_TYPE is ${PACKAGE_TYPE}" - echo "PACKAGECLOUD_DISTRO is ${PACKAGECLOUD_DISTRO}" - echo "VERSION is ${VERSION}" - echo "" - - if [[ "${PACKAGE_TYPE}" == "deb" ]]; then - echo "pushing: deb_dist/dangerzone_${VERSION}-1_all.deb" - package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTRO}" "deb_dist/dangerzone_${VERSION}-1_all.deb" - echo "" - echo "pushing: deb_dist/dangerzone_${VERSION}-1.dsc" - package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTRO}" "deb_dist/dangerzone_${VERSION}-1.dsc" - elif [[ "${PACKAGE_TYPE}" == "rpm" ]]; then - echo "pushing: dist/dangerzone-${VERSION}-1.noarch.rpm" - package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTRO}" "dist/dangerzone-${VERSION}-1.noarch.rpm" - echo "" - echo "pushing: dist/dangerzone-${VERSION}-1.src.rpm" - package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTRO}" "dist/dangerzone-${VERSION}-1.src.rpm" - fi - jobs: run-lint: docker: @@ -425,100 +403,6 @@ jobs: - run: *copy-image - run: *build-rpm - deploy-fedora: - docker: - - image: fedora:36 - resource_class: medium+ - steps: - - run: *install-dependencies-rpm - - checkout - - restore_cache: *restore-cache - - run: *copy-image - - run: *build-rpm - - run: - name: Install packagecloud.io - command: | - dnf module install -y ruby:2.7 # requires ruby 2.7 - dnf --allowerasing -y distro-sync - dnf install -y ruby-devel - gem install package_cloud - - run: - name: Deploy fedora/37 - environment: - PACKAGE_TYPE: "rpm" - PACKAGECLOUD_DISTRO: "fedora/37" - <<: *deploy-packagecloud - - run: - name: Deploy fedora/36 - environment: - PACKAGE_TYPE: "rpm" - PACKAGECLOUD_DISTRO: "fedora/36" - <<: *deploy-packagecloud - - deploy-debian: - docker: - - image: debian:bullseye - resource_class: medium+ - steps: - - run: *install-dependencies-deb - - checkout - - restore_cache: *restore-cache - - run: *copy-image - - run: *build-deb - - run: - name: Install packagecloud.io - command: | - apt-get install -y ruby-dev rubygems - gem install -N rake - gem install -N package_cloud - - run: - name: Deploy debian/bullseye - environment: - PACKAGE_TYPE: "deb" - PACKAGECLOUD_DISTRO: "debian/bullseye" - <<: *deploy-packagecloud - - run: - name: Deploy debian/bookworm - environment: - PACKAGE_TYPE: "deb" - PACKAGECLOUD_DISTRO: "debian/bookworm" - <<: *deploy-packagecloud - - deploy-ubuntu: - docker: - - image: ubuntu:22.04 - resource_class: medium+ - steps: - - run: *install-dependencies-deb - - checkout - - restore_cache: *restore-cache - - run: *copy-image - - run: *build-deb - - run: - name: Install packagecloud.io - command: | - apt-get install -y ruby-dev rubygems - gem install -N rake - gem install -N package_cloud - - run: - name: Deploy ubuntu/kinetic - environment: - PACKAGE_TYPE: "deb" - PACKAGECLOUD_DISTRO: "ubuntu/kinetic" - <<: *deploy-packagecloud - - run: - name: Deploy ubuntu/jammy - environment: - PACKAGE_TYPE: "deb" - PACKAGECLOUD_DISTRO: "ubuntu/jammy" - <<: *deploy-packagecloud - - run: - name: Deploy ubuntu/focal - environment: - PACKAGE_TYPE: "deb" - PACKAGECLOUD_DISTRO: "ubuntu/focal" - <<: *deploy-packagecloud - workflows: version: 2 @@ -571,36 +455,3 @@ workflows: - build-fedora-36: requires: - build-container-image - - build-and-deploy: - jobs: - - build-container-image: - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - - deploy-ubuntu: - requires: - - build-container-image - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - - deploy-debian: - requires: - - build-container-image - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/ - - deploy-fedora: - requires: - - build-container-image - filters: - tags: - only: /^v.*/ - branches: - ignore: /.*/