ci: Remove Fedora 35 support

Fedora 35 has reached its end of life [1], so we remove it from our CI
builds.

Closes #308

[1]: https://endoflife.date/fedora
This commit is contained in:
Alex Pyrgiotis 2023-01-16 18:41:00 +02:00
parent 586240ec22
commit 7d0b6d44ba
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
2 changed files with 1 additions and 51 deletions

View file

@ -236,32 +236,6 @@ jobs:
./dev_scripts/env.py --distro fedora --version 36 run --dev \ ./dev_scripts/env.py --distro fedora --version 36 run --dev \
bash -c 'cd dangerzone; poetry run make test' 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: ci-debian-bookworm:
machine: machine:
image: ubuntu-2004:202111-01 image: ubuntu-2004:202111-01
@ -366,20 +340,9 @@ jobs:
- run: *copy-image - run: *copy-image
- run: *build-rpm - 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: deploy-fedora:
docker: docker:
- image: fedora:35 - image: fedora:36
resource_class: medium+ resource_class: medium+
steps: steps:
- run: *install-dependencies-rpm - run: *install-dependencies-rpm
@ -406,12 +369,6 @@ jobs:
PACKAGE_TYPE: "rpm" PACKAGE_TYPE: "rpm"
PACKAGECLOUD_DISTRO: "fedora/36" PACKAGECLOUD_DISTRO: "fedora/36"
<<: *deploy-packagecloud <<: *deploy-packagecloud
- run:
name: Deploy fedora/35
environment:
PACKAGE_TYPE: "rpm"
PACKAGECLOUD_DISTRO: "fedora/35"
<<: *deploy-packagecloud
deploy-debian: deploy-debian:
docker: docker:
@ -499,9 +456,6 @@ workflows:
- ci-fedora-36: - ci-fedora-36:
requires: requires:
- build-container-image - build-container-image
- ci-fedora-35:
requires:
- build-container-image
- build-ubuntu-kinetic: - build-ubuntu-kinetic:
requires: requires:
- build-container-image - build-container-image
@ -523,9 +477,6 @@ workflows:
- build-fedora-36: - build-fedora-36:
requires: requires:
- build-container-image - build-container-image
- build-fedora-35:
requires:
- build-container-image
build-and-deploy: build-and-deploy:
jobs: jobs:

View file

@ -7,7 +7,6 @@ Dangerzone is available for:
- Debian 11 (bullseye) - Debian 11 (bullseye)
- Fedora 37 - Fedora 37
- Fedora 36 - Fedora 36
- Fedora 35
### Ubuntu, Debian ### Ubuntu, Debian