Skip to content

Commit

Permalink
ci: Remove Fedora 35 support
Browse files Browse the repository at this point in the history
Fedora 35 has reached its end of life [1], so we remove it from our CI
builds.

Closes freedomofpress#308

[1]: https://endoflife.date/fedora
  • Loading branch information
apyrgio committed Jan 16, 2023
1 parent 586240e commit 7d0b6d4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 51 deletions.
51 changes: 1 addition & 50 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236,32 +236,6 @@ jobs:
./dev_scripts/env.py --distro fedora --version 36 run --dev \
bash -c 'cd dangerzone; poetry run make test'
ci-fedora-35:
machine:
image: ubuntu-2004:202111-01
steps:
- checkout
- run: *install-podman

- run:
name: Prepare cache directory
command: |
sudo mkdir -p /caches
sudo chown -R $USER:$USER /caches
- restore_cache: *restore-cache
- run: *copy-image

- run:
name: Prepare Dangerzone environment
command: |
./dev_scripts/env.py --distro fedora --version 35 build-dev
- run:
name: Run CI tests
command: |
./dev_scripts/env.py --distro fedora --version 35 run --dev \
bash -c 'cd dangerzone; poetry run make test'
ci-debian-bookworm:
machine:
image: ubuntu-2004:202111-01
Expand Down Expand Up @@ -366,20 +340,9 @@ jobs:
- run: *copy-image
- run: *build-rpm

build-fedora-35:
docker:
- image: fedora:35
resource_class: medium+
steps:
- run: *install-dependencies-rpm
- checkout
- restore_cache: *restore-cache
- run: *copy-image
- run: *build-rpm

deploy-fedora:
docker:
- image: fedora:35
- image: fedora:36
resource_class: medium+
steps:
- run: *install-dependencies-rpm
Expand All @@ -406,12 +369,6 @@ jobs:
PACKAGE_TYPE: "rpm"
PACKAGECLOUD_DISTRO: "fedora/36"
<<: *deploy-packagecloud
- run:
name: Deploy fedora/35
environment:
PACKAGE_TYPE: "rpm"
PACKAGECLOUD_DISTRO: "fedora/35"
<<: *deploy-packagecloud

deploy-debian:
docker:
Expand Down Expand Up @@ -499,9 +456,6 @@ workflows:
- ci-fedora-36:
requires:
- build-container-image
- ci-fedora-35:
requires:
- build-container-image
- build-ubuntu-kinetic:
requires:
- build-container-image
Expand All @@ -523,9 +477,6 @@ workflows:
- build-fedora-36:
requires:
- build-container-image
- build-fedora-35:
requires:
- build-container-image

build-and-deploy:
jobs:
Expand Down
1 change: 0 additions & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Dangerzone is available for:
- Debian 11 (bullseye)
- Fedora 37
- Fedora 36
- Fedora 35

### Ubuntu, Debian

Expand Down

0 comments on commit 7d0b6d4

Please sign in to comment.