mirror of
https://github.com/freedomofpress/dangerzone.git
synced 2025-04-28 18:02:38 +02:00
parent
2703448d60
commit
8f11156ce4
7 changed files with 1 additions and 60 deletions
|
@ -192,33 +192,6 @@ jobs:
|
||||||
./dev_scripts/env.py --distro ubuntu --version 23.10 run --dev \
|
./dev_scripts/env.py --distro ubuntu --version 23.10 run --dev \
|
||||||
bash -c 'cd dangerzone; poetry run make test'
|
bash -c 'cd dangerzone; poetry run make test'
|
||||||
|
|
||||||
ci-ubuntu-lunar:
|
|
||||||
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
|
|
||||||
- run: *calculate-cache-key
|
|
||||||
- restore_cache: *restore-cache
|
|
||||||
- run: *copy-image
|
|
||||||
|
|
||||||
- run:
|
|
||||||
name: Prepare Dangerzone environment
|
|
||||||
command: |
|
|
||||||
./dev_scripts/env.py --distro ubuntu --version 23.04 build-dev
|
|
||||||
|
|
||||||
- run:
|
|
||||||
name: Run CI tests
|
|
||||||
command: |
|
|
||||||
./dev_scripts/env.py --distro ubuntu --version 23.04 run --dev \
|
|
||||||
bash -c 'cd dangerzone; poetry run make test'
|
|
||||||
|
|
||||||
ci-ubuntu-jammy:
|
ci-ubuntu-jammy:
|
||||||
machine:
|
machine:
|
||||||
image: ubuntu-2004:202111-01
|
image: ubuntu-2004:202111-01
|
||||||
|
@ -453,18 +426,6 @@ jobs:
|
||||||
- run: *copy-image
|
- run: *copy-image
|
||||||
- run: *build-deb
|
- run: *build-deb
|
||||||
|
|
||||||
build-ubuntu-lunar:
|
|
||||||
docker:
|
|
||||||
- image: ubuntu:23.04
|
|
||||||
resource_class: medium+
|
|
||||||
steps:
|
|
||||||
- run: *install-dependencies-deb
|
|
||||||
- checkout
|
|
||||||
- run: *calculate-cache-key
|
|
||||||
- restore_cache: *restore-cache
|
|
||||||
- run: *copy-image
|
|
||||||
- run: *build-deb
|
|
||||||
|
|
||||||
build-ubuntu-jammy:
|
build-ubuntu-jammy:
|
||||||
docker:
|
docker:
|
||||||
- image: ubuntu:22.04
|
- image: ubuntu:22.04
|
||||||
|
@ -566,9 +527,6 @@ workflows:
|
||||||
- ci-ubuntu-mantic:
|
- ci-ubuntu-mantic:
|
||||||
requires:
|
requires:
|
||||||
- build-container-image
|
- build-container-image
|
||||||
- ci-ubuntu-lunar:
|
|
||||||
requires:
|
|
||||||
- build-container-image
|
|
||||||
- ci-ubuntu-jammy:
|
- ci-ubuntu-jammy:
|
||||||
requires:
|
requires:
|
||||||
- build-container-image
|
- build-container-image
|
||||||
|
@ -593,9 +551,6 @@ workflows:
|
||||||
- build-ubuntu-mantic:
|
- build-ubuntu-mantic:
|
||||||
requires:
|
requires:
|
||||||
- build-container-image
|
- build-container-image
|
||||||
- build-ubuntu-lunar:
|
|
||||||
requires:
|
|
||||||
- build-container-image
|
|
||||||
- build-ubuntu-jammy:
|
- build-ubuntu-jammy:
|
||||||
requires:
|
requires:
|
||||||
- build-container-image
|
- build-container-image
|
||||||
|
|
2
.github/workflows/check_repos.yml
vendored
2
.github/workflows/check_repos.yml
vendored
|
@ -20,8 +20,6 @@ jobs:
|
||||||
include:
|
include:
|
||||||
- distro: ubuntu
|
- distro: ubuntu
|
||||||
version: "23.10" # mantic
|
version: "23.10" # mantic
|
||||||
- distro: ubuntu
|
|
||||||
version: "23.04" # lunar
|
|
||||||
- distro: ubuntu
|
- distro: ubuntu
|
||||||
version: "22.04" # jammy
|
version: "22.04" # jammy
|
||||||
- distro: ubuntu
|
- distro: ubuntu
|
||||||
|
|
3
.github/workflows/ci.yml
vendored
3
.github/workflows/ci.yml
vendored
|
@ -92,9 +92,6 @@ jobs:
|
||||||
- target: ubuntu-22.04
|
- target: ubuntu-22.04
|
||||||
distro: ubuntu
|
distro: ubuntu
|
||||||
version: "22.04"
|
version: "22.04"
|
||||||
- target: ubuntu-23.04
|
|
||||||
distro: ubuntu
|
|
||||||
version: "23.04"
|
|
||||||
- target: ubuntu-23.10
|
- target: ubuntu-23.10
|
||||||
distro: ubuntu
|
distro: ubuntu
|
||||||
version: "23.10"
|
version: "23.10"
|
||||||
|
|
|
@ -24,6 +24,7 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or
|
||||||
### Removed
|
### Removed
|
||||||
|
|
||||||
- Removed timeouts ([issue #687](https://github.com/freedomofpress/dangerzone/issues/687))
|
- Removed timeouts ([issue #687](https://github.com/freedomofpress/dangerzone/issues/687))
|
||||||
|
- Platform support: Drop Ubuntu 23.04 (Lunar Lobster), since it's end-of-life ([issue #705](https://github.com/freedomofpress/dangerzone/issues/705))
|
||||||
|
|
||||||
## Dangerzone 0.5.1
|
## Dangerzone 0.5.1
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ an isolated environment. It will be installed automatically when installing Dang
|
||||||
|
|
||||||
Dangerzone is available for:
|
Dangerzone is available for:
|
||||||
- Ubuntu 23.10 (mantic)
|
- Ubuntu 23.10 (mantic)
|
||||||
- Ubuntu 23.04 (lunar)
|
|
||||||
- Ubuntu 22.04 (jammy)
|
- Ubuntu 22.04 (jammy)
|
||||||
- Ubuntu 20.04 (focal)
|
- Ubuntu 20.04 (focal)
|
||||||
- Debian 13 (trixie)
|
- Debian 13 (trixie)
|
||||||
|
|
|
@ -574,9 +574,7 @@ class Env:
|
||||||
DOCKERFILE_CONMON_UPDATE + DOCKERFILE_BUILD_DEV_DEBIAN_DEPS
|
DOCKERFILE_CONMON_UPDATE + DOCKERFILE_BUILD_DEV_DEBIAN_DEPS
|
||||||
)
|
)
|
||||||
elif self.distro == "ubuntu" and self.version in (
|
elif self.distro == "ubuntu" and self.version in (
|
||||||
"23.04",
|
|
||||||
"23.10",
|
"23.10",
|
||||||
"lunar",
|
|
||||||
"mantic",
|
"mantic",
|
||||||
):
|
):
|
||||||
install_deps = (
|
install_deps = (
|
||||||
|
@ -662,9 +660,7 @@ class Env:
|
||||||
# package (see https://github.com/freedomofpress/dangerzone/issues/685)
|
# package (see https://github.com/freedomofpress/dangerzone/issues/685)
|
||||||
install_deps = DOCKERFILE_CONMON_UPDATE + DOCKERFILE_BUILD_DEBIAN_DEPS
|
install_deps = DOCKERFILE_CONMON_UPDATE + DOCKERFILE_BUILD_DEBIAN_DEPS
|
||||||
elif self.distro == "ubuntu" and self.version in (
|
elif self.distro == "ubuntu" and self.version in (
|
||||||
"23.04",
|
|
||||||
"23.10",
|
"23.10",
|
||||||
"lunar",
|
|
||||||
"mantic",
|
"mantic",
|
||||||
):
|
):
|
||||||
install_deps = DOCKERFILE_UBUNTU_REM_USER + DOCKERFILE_BUILD_DEBIAN_DEPS
|
install_deps = DOCKERFILE_UBUNTU_REM_USER + DOCKERFILE_BUILD_DEBIAN_DEPS
|
||||||
|
|
|
@ -887,11 +887,6 @@ class QAUbuntu2204(QADebianBased):
|
||||||
VERSION = "22.04"
|
VERSION = "22.04"
|
||||||
|
|
||||||
|
|
||||||
class QAUbuntu2304(QADebianBased):
|
|
||||||
DISTRO = "ubuntu"
|
|
||||||
VERSION = "23.04"
|
|
||||||
|
|
||||||
|
|
||||||
class QAUbuntu2310(QADebianBased):
|
class QAUbuntu2310(QADebianBased):
|
||||||
DISTRO = "ubuntu"
|
DISTRO = "ubuntu"
|
||||||
VERSION = "23.10"
|
VERSION = "23.10"
|
||||||
|
|
Loading…
Reference in a new issue