From a04ed076cb33ed593f939b5c195eccd76da7ab70 Mon Sep 17 00:00:00 2001 From: deeplow Date: Mon, 11 Jul 2022 11:01:19 +0100 Subject: [PATCH 1/3] update distros in CI (deprecate old & add new ver.) --- .circleci/config.yml | 106 +++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 317c03a..9efd3ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -132,6 +132,17 @@ jobs: echo done + build-ubuntu-jammy: + docker: + - image: ubuntu:22.04 + resource_class: medium+ + steps: + - run: *install-dependencies-deb + - checkout + - restore_cache: *restore-cache + - run: *copy-image + - run: *build-deb + build-ubuntu-impish: docker: - image: ubuntu:21.10 @@ -154,17 +165,6 @@ jobs: - run: *copy-image - run: *build-deb - build-ubuntu-groovy: - docker: - - image: ubuntu:20.10 - resource_class: medium+ - steps: - - run: *install-dependencies-deb - - checkout - - restore_cache: *restore-cache - - run: *copy-image - - run: *build-deb - build-debian-bookworm: docker: - image: debian:bookworm @@ -187,6 +187,28 @@ jobs: - run: *copy-image - run: *build-deb + build-fedora-37: + docker: + - image: fedora:37 + resource_class: medium+ + steps: + - run: *install-dependencies-rpm + - checkout + - restore_cache: *restore-cache + - run: *copy-image + - run: *build-rpm + + build-fedora-36: + docker: + - image: fedora:36 + resource_class: medium+ + steps: + - run: *install-dependencies-rpm + - checkout + - restore_cache: *restore-cache + - run: *copy-image + - run: *build-rpm + build-fedora-35: docker: - image: fedora:35 @@ -198,31 +220,9 @@ jobs: - run: *copy-image - run: *build-rpm - build-fedora-34: - docker: - - image: fedora:34 - resource_class: medium+ - steps: - - run: *install-dependencies-rpm - - checkout - - restore_cache: *restore-cache - - run: *copy-image - - run: *build-rpm - - build-fedora-33: - docker: - - image: fedora:33 - resource_class: medium+ - steps: - - run: *install-dependencies-rpm - - checkout - - restore_cache: *restore-cache - - run: *copy-image - - run: *build-rpm - deploy-fedora: docker: - - image: fedora:33 + - image: fedora:35 resource_class: medium+ steps: - run: *install-dependencies-rpm @@ -238,16 +238,16 @@ jobs: dnf install -y ruby-devel gem install package_cloud - run: - name: Deploy fedora/33 + name: Deploy fedora/37 environment: PACKAGE_TYPE: "rpm" - PACKAGECLOUD_DISTRO: "fedora/33" + PACKAGECLOUD_DISTRO: "fedora/37" <<: *deploy-packagecloud - run: - name: Deploy fedora/34 + name: Deploy fedora/36 environment: PACKAGE_TYPE: "rpm" - PACKAGECLOUD_DISTRO: "fedora/34" + PACKAGECLOUD_DISTRO: "fedora/36" <<: *deploy-packagecloud - run: name: Deploy fedora/35 @@ -301,6 +301,12 @@ jobs: apt-get install -y ruby-dev rubygems gem install -N rake gem install -N package_cloud + - run: + name: Deploy ubuntu/jammy + environment: + PACKAGE_TYPE: "deb" + PACKAGECLOUD_DISTRO: "ubuntu/jammy" + <<: *deploy-packagecloud - run: name: Deploy ubuntu/impish environment: @@ -313,12 +319,6 @@ jobs: PACKAGE_TYPE: "deb" PACKAGECLOUD_DISTRO: "ubuntu/hirsute" <<: *deploy-packagecloud - - run: - name: Deploy ubuntu/groovy - environment: - PACKAGE_TYPE: "deb" - PACKAGECLOUD_DISTRO: "ubuntu/groovy" - <<: *deploy-packagecloud workflows: version: 2 @@ -329,30 +329,30 @@ workflows: - convert-test-docs: requires: - build-container-image + - build-ubuntu-jammy: + requires: + - build-container-image - build-ubuntu-impish: requires: - build-container-image - build-ubuntu-hirsute: requires: - build-container-image - - build-ubuntu-groovy: - requires: - - build-container-image - build-debian-bullseye: requires: - build-container-image - build-debian-bookworm: requires: - build-container-image + - build-fedora-37: + requires: + - build-container-image + - build-fedora-36: + requires: + - build-container-image - build-fedora-35: requires: - build-container-image - - build-fedora-34: - requires: - - build-container-image - - build-fedora-33: - requires: - - build-container-image build-and-deploy: jobs: From 47364c200c38950fd156f60316d6b81893ae55a1 Mon Sep 17 00:00:00 2001 From: deeplow Date: Mon, 18 Jul 2022 13:23:47 +0100 Subject: [PATCH 2/3] disable debian 12 while waiting on upsteam fix More details at https://github.com/freedomofpress/dangerzone/issues/172 --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9efd3ec..3f53497 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -341,9 +341,10 @@ workflows: - build-debian-bullseye: requires: - build-container-image - - build-debian-bookworm: - requires: - - build-container-image + ## Waiting for upstream fix https://github.com/freedomofpress/dangerzone/issues/172 + #- build-debian-bookworm: + # requires: + # - build-container-image - build-fedora-37: requires: - build-container-image From c713801e777ef3e016f18e48eee69efbe5a863e4 Mon Sep 17 00:00:00 2001 From: deeplow Date: Thu, 4 Aug 2022 19:23:41 +0100 Subject: [PATCH 3/3] remove EOL ubuntu versions --- .circleci/config.yml | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3f53497..420fa35 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -143,28 +143,6 @@ jobs: - run: *copy-image - run: *build-deb - build-ubuntu-impish: - docker: - - image: ubuntu:21.10 - resource_class: medium+ - steps: - - run: *install-dependencies-deb - - checkout - - restore_cache: *restore-cache - - run: *copy-image - - run: *build-deb - - build-ubuntu-hirsute: - docker: - - image: ubuntu:21.04 - resource_class: medium+ - steps: - - run: *install-dependencies-deb - - checkout - - restore_cache: *restore-cache - - run: *copy-image - - run: *build-deb - build-debian-bookworm: docker: - image: debian:bookworm @@ -287,7 +265,7 @@ jobs: deploy-ubuntu: docker: - - image: ubuntu:21.04 + - image: ubuntu:22.04 resource_class: medium+ steps: - run: *install-dependencies-deb @@ -307,18 +285,6 @@ jobs: PACKAGE_TYPE: "deb" PACKAGECLOUD_DISTRO: "ubuntu/jammy" <<: *deploy-packagecloud - - run: - name: Deploy ubuntu/impish - environment: - PACKAGE_TYPE: "deb" - PACKAGECLOUD_DISTRO: "ubuntu/impish" - <<: *deploy-packagecloud - - run: - name: Deploy ubuntu/hirsute - environment: - PACKAGE_TYPE: "deb" - PACKAGECLOUD_DISTRO: "ubuntu/hirsute" - <<: *deploy-packagecloud workflows: version: 2 @@ -332,12 +298,6 @@ workflows: - build-ubuntu-jammy: requires: - build-container-image - - build-ubuntu-impish: - requires: - - build-container-image - - build-ubuntu-hirsute: - requires: - - build-container-image - build-debian-bullseye: requires: - build-container-image