mirror of
https://github.com/freedomofpress/dangerzone.git
synced 2025-04-29 02:12:36 +02:00
Compare commits
5 commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
02151b5b9f | ||
![]() |
05d08e084d | ||
![]() |
b416a566be | ||
![]() |
58b23a6338 | ||
![]() |
b25db1042b |
2 changed files with 116 additions and 113 deletions
|
@ -60,11 +60,11 @@ aliases:
|
||||||
echo "pushing: deb_dist/dangerzone_${VERSION}-1.dsc"
|
echo "pushing: deb_dist/dangerzone_${VERSION}-1.dsc"
|
||||||
package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTRO}" "deb_dist/dangerzone_${VERSION}-1.dsc"
|
package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTRO}" "deb_dist/dangerzone_${VERSION}-1.dsc"
|
||||||
elif [[ "${PACKAGE_TYPE}" == "rpm" ]]; then
|
elif [[ "${PACKAGE_TYPE}" == "rpm" ]]; then
|
||||||
echo "pushing: dist/dangerzone-${VERSION}-1.noarch.rpm"
|
echo "pushing: dist/dangerzone-${VERSION}-2.noarch.rpm"
|
||||||
package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTRO}" "dist/dangerzone-${VERSION}-1.noarch.rpm"
|
package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTRO}" "dist/dangerzone-${VERSION}-2.noarch.rpm"
|
||||||
echo ""
|
echo ""
|
||||||
echo "pushing: dist/dangerzone-${VERSION}-1.src.rpm"
|
echo "pushing: dist/dangerzone-${VERSION}-2.src.rpm"
|
||||||
package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTRO}" "dist/dangerzone-${VERSION}-1.src.rpm"
|
package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTRO}" "dist/dangerzone-${VERSION}-2.src.rpm"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -83,7 +83,7 @@ jobs:
|
||||||
python3 -m venv .venv
|
python3 -m venv .venv
|
||||||
source .venv/bin/activate
|
source .venv/bin/activate
|
||||||
pip install poetry
|
pip install poetry
|
||||||
poetry install # FIXME --dev-only once poetry 1.2.0 is out https://github.com/python-poetry/poetry/issues/2572
|
poetry --no-ansi install # FIXME --dev-only once poetry 1.2.0 is out https://github.com/python-poetry/poetry/issues/2572
|
||||||
- run:
|
- run:
|
||||||
name: Run linters to enforce code style
|
name: Run linters to enforce code style
|
||||||
command: |
|
command: |
|
||||||
|
@ -135,7 +135,7 @@ jobs:
|
||||||
name: Install poetry dependencies
|
name: Install poetry dependencies
|
||||||
command: |
|
command: |
|
||||||
sudo pip3 install poetry
|
sudo pip3 install poetry
|
||||||
poetry install
|
poetry install --no-ansi
|
||||||
- run:
|
- run:
|
||||||
name: Prepare cache directory
|
name: Prepare cache directory
|
||||||
command: |
|
command: |
|
||||||
|
@ -182,16 +182,16 @@ jobs:
|
||||||
- run: *copy-image
|
- run: *copy-image
|
||||||
- run: *build-deb
|
- run: *build-deb
|
||||||
|
|
||||||
build-debian-bookworm:
|
#build-debian-bookworm:
|
||||||
docker:
|
# docker:
|
||||||
- image: debian:bookworm
|
# - image: debian:bookworm
|
||||||
resource_class: medium+
|
# resource_class: medium+
|
||||||
steps:
|
# steps:
|
||||||
- run: *install-dependencies-deb
|
# - run: *install-dependencies-deb
|
||||||
- checkout
|
# - checkout
|
||||||
- restore_cache: *restore-cache
|
# - restore_cache: *restore-cache
|
||||||
- run: *copy-image
|
# - run: *copy-image
|
||||||
- run: *build-deb
|
# - run: *build-deb
|
||||||
|
|
||||||
build-debian-bullseye:
|
build-debian-bullseye:
|
||||||
docker:
|
docker:
|
||||||
|
@ -239,7 +239,7 @@ jobs:
|
||||||
|
|
||||||
deploy-fedora:
|
deploy-fedora:
|
||||||
docker:
|
docker:
|
||||||
- image: fedora:35
|
- image: fedora:37
|
||||||
resource_class: medium+
|
resource_class: medium+
|
||||||
steps:
|
steps:
|
||||||
- run: *install-dependencies-rpm
|
- run: *install-dependencies-rpm
|
||||||
|
@ -250,9 +250,12 @@ jobs:
|
||||||
- run:
|
- run:
|
||||||
name: Install packagecloud.io
|
name: Install packagecloud.io
|
||||||
command: |
|
command: |
|
||||||
dnf module install -y ruby:2.7 # requires ruby 2.7
|
# Fedora 37 has ruby 3.1 instead of 2.7.
|
||||||
|
dnf module install -y ruby:3.1
|
||||||
dnf --allowerasing -y distro-sync
|
dnf --allowerasing -y distro-sync
|
||||||
dnf install -y ruby-devel
|
# In order to build some native libraries (e.g., unf_ext), we also
|
||||||
|
# need to install C++ build tools.
|
||||||
|
dnf install -y ruby-devel make automake gcc gcc-c++
|
||||||
gem install package_cloud
|
gem install package_cloud
|
||||||
- run:
|
- run:
|
||||||
name: Deploy fedora/37
|
name: Deploy fedora/37
|
||||||
|
@ -260,82 +263,82 @@ jobs:
|
||||||
PACKAGE_TYPE: "rpm"
|
PACKAGE_TYPE: "rpm"
|
||||||
PACKAGECLOUD_DISTRO: "fedora/37"
|
PACKAGECLOUD_DISTRO: "fedora/37"
|
||||||
<<: *deploy-packagecloud
|
<<: *deploy-packagecloud
|
||||||
- run:
|
#- run:
|
||||||
name: Deploy fedora/36
|
# name: Deploy fedora/36
|
||||||
environment:
|
# environment:
|
||||||
PACKAGE_TYPE: "rpm"
|
# PACKAGE_TYPE: "rpm"
|
||||||
PACKAGECLOUD_DISTRO: "fedora/36"
|
# PACKAGECLOUD_DISTRO: "fedora/36"
|
||||||
<<: *deploy-packagecloud
|
# <<: *deploy-packagecloud
|
||||||
- run:
|
#- run:
|
||||||
name: Deploy fedora/35
|
# name: Deploy fedora/35
|
||||||
environment:
|
# environment:
|
||||||
PACKAGE_TYPE: "rpm"
|
# PACKAGE_TYPE: "rpm"
|
||||||
PACKAGECLOUD_DISTRO: "fedora/35"
|
# PACKAGECLOUD_DISTRO: "fedora/35"
|
||||||
<<: *deploy-packagecloud
|
# <<: *deploy-packagecloud
|
||||||
|
|
||||||
deploy-debian:
|
#deploy-debian:
|
||||||
docker:
|
# docker:
|
||||||
- image: debian:bullseye
|
# - image: debian:bullseye
|
||||||
resource_class: medium+
|
# resource_class: medium+
|
||||||
steps:
|
# steps:
|
||||||
- run: *install-dependencies-deb
|
# - run: *install-dependencies-deb
|
||||||
- checkout
|
# - checkout
|
||||||
- restore_cache: *restore-cache
|
# - restore_cache: *restore-cache
|
||||||
- run: *copy-image
|
# - run: *copy-image
|
||||||
- run: *build-deb
|
# - run: *build-deb
|
||||||
- run:
|
# - run:
|
||||||
name: Install packagecloud.io
|
# name: Install packagecloud.io
|
||||||
command: |
|
# command: |
|
||||||
apt-get install -y ruby-dev rubygems
|
# apt-get install -y ruby-dev rubygems
|
||||||
gem install -N rake
|
# gem install -N rake
|
||||||
gem install -N package_cloud
|
# gem install -N package_cloud
|
||||||
- run:
|
# - run:
|
||||||
name: Deploy debian/bullseye
|
# name: Deploy debian/bullseye
|
||||||
environment:
|
# environment:
|
||||||
PACKAGE_TYPE: "deb"
|
# PACKAGE_TYPE: "deb"
|
||||||
PACKAGECLOUD_DISTRO: "debian/bullseye"
|
# PACKAGECLOUD_DISTRO: "debian/bullseye"
|
||||||
<<: *deploy-packagecloud
|
# <<: *deploy-packagecloud
|
||||||
- run:
|
# - run:
|
||||||
name: Deploy debian/bookworm
|
# name: Deploy debian/bookworm
|
||||||
environment:
|
# environment:
|
||||||
PACKAGE_TYPE: "deb"
|
# PACKAGE_TYPE: "deb"
|
||||||
PACKAGECLOUD_DISTRO: "debian/bookworm"
|
# PACKAGECLOUD_DISTRO: "debian/bookworm"
|
||||||
<<: *deploy-packagecloud
|
# <<: *deploy-packagecloud
|
||||||
|
|
||||||
deploy-ubuntu:
|
#deploy-ubuntu:
|
||||||
docker:
|
# docker:
|
||||||
- image: ubuntu:22.04
|
# - image: ubuntu:22.04
|
||||||
resource_class: medium+
|
# resource_class: medium+
|
||||||
steps:
|
# steps:
|
||||||
- run: *install-dependencies-deb
|
# - run: *install-dependencies-deb
|
||||||
- checkout
|
# - checkout
|
||||||
- restore_cache: *restore-cache
|
# - restore_cache: *restore-cache
|
||||||
- run: *copy-image
|
# - run: *copy-image
|
||||||
- run: *build-deb
|
# - run: *build-deb
|
||||||
- run:
|
# - run:
|
||||||
name: Install packagecloud.io
|
# name: Install packagecloud.io
|
||||||
command: |
|
# command: |
|
||||||
apt-get install -y ruby-dev rubygems
|
# apt-get install -y ruby-dev rubygems
|
||||||
gem install -N rake
|
# gem install -N rake
|
||||||
gem install -N package_cloud
|
# gem install -N package_cloud
|
||||||
- run:
|
# - run:
|
||||||
name: Deploy ubuntu/kinetic
|
# name: Deploy ubuntu/kinetic
|
||||||
environment:
|
# environment:
|
||||||
PACKAGE_TYPE: "deb"
|
# PACKAGE_TYPE: "deb"
|
||||||
PACKAGECLOUD_DISTRO: "ubuntu/kinetic"
|
# PACKAGECLOUD_DISTRO: "ubuntu/kinetic"
|
||||||
<<: *deploy-packagecloud
|
# <<: *deploy-packagecloud
|
||||||
- run:
|
# - run:
|
||||||
name: Deploy ubuntu/jammy
|
# name: Deploy ubuntu/jammy
|
||||||
environment:
|
# environment:
|
||||||
PACKAGE_TYPE: "deb"
|
# PACKAGE_TYPE: "deb"
|
||||||
PACKAGECLOUD_DISTRO: "ubuntu/jammy"
|
# PACKAGECLOUD_DISTRO: "ubuntu/jammy"
|
||||||
<<: *deploy-packagecloud
|
# <<: *deploy-packagecloud
|
||||||
- run:
|
# - run:
|
||||||
name: Deploy ubuntu/focal
|
# name: Deploy ubuntu/focal
|
||||||
environment:
|
# environment:
|
||||||
PACKAGE_TYPE: "deb"
|
# PACKAGE_TYPE: "deb"
|
||||||
PACKAGECLOUD_DISTRO: "ubuntu/focal"
|
# PACKAGECLOUD_DISTRO: "ubuntu/focal"
|
||||||
<<: *deploy-packagecloud
|
# <<: *deploy-packagecloud
|
||||||
|
|
||||||
workflows:
|
workflows:
|
||||||
version: 2
|
version: 2
|
||||||
|
@ -359,9 +362,9 @@ workflows:
|
||||||
- build-debian-bullseye:
|
- build-debian-bullseye:
|
||||||
requires:
|
requires:
|
||||||
- build-container-image
|
- build-container-image
|
||||||
- build-debian-bookworm:
|
#- build-debian-bookworm:
|
||||||
requires:
|
# requires:
|
||||||
- build-container-image
|
# - build-container-image
|
||||||
- build-fedora-37:
|
- build-fedora-37:
|
||||||
requires:
|
requires:
|
||||||
- build-container-image
|
- build-container-image
|
||||||
|
@ -380,22 +383,22 @@ workflows:
|
||||||
only: /^v.*/
|
only: /^v.*/
|
||||||
branches:
|
branches:
|
||||||
ignore: /.*/
|
ignore: /.*/
|
||||||
- deploy-ubuntu:
|
#- deploy-ubuntu:
|
||||||
requires:
|
# requires:
|
||||||
- build-container-image
|
# - build-container-image
|
||||||
filters:
|
# filters:
|
||||||
tags:
|
# tags:
|
||||||
only: /^v.*/
|
# only: /^v.*/
|
||||||
branches:
|
# branches:
|
||||||
ignore: /.*/
|
# ignore: /.*/
|
||||||
- deploy-debian:
|
#- deploy-debian:
|
||||||
requires:
|
# requires:
|
||||||
- build-container-image
|
# - build-container-image
|
||||||
filters:
|
# filters:
|
||||||
tags:
|
# tags:
|
||||||
only: /^v.*/
|
# only: /^v.*/
|
||||||
branches:
|
# branches:
|
||||||
ignore: /.*/
|
# ignore: /.*/
|
||||||
- deploy-fedora:
|
- deploy-fedora:
|
||||||
requires:
|
requires:
|
||||||
- build-container-image
|
- build-container-image
|
||||||
|
|
|
@ -28,7 +28,7 @@ def main():
|
||||||
|
|
||||||
print("* Building RPM package")
|
print("* Building RPM package")
|
||||||
subprocess.run(
|
subprocess.run(
|
||||||
"python3 setup.py bdist_rpm --requires='podman,python3-pyside2,python3-appdirs,python3-click,python3-pyxdg,python3-colorama'",
|
"python3 setup.py bdist_rpm --release=2 --requires='podman,python3-pyside2,python3-appdirs,python3-click,python3-pyxdg,python3-colorama'",
|
||||||
shell=True,
|
shell=True,
|
||||||
cwd=root,
|
cwd=root,
|
||||||
check=True,
|
check=True,
|
||||||
|
|
Loading…
Reference in a new issue