almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix CircleCI and test in Fedora

Browse source
This commit is contained in:
Micah Lee 2020-10-29 17:01:47 -07:00
parent f9a0af6fa7
commit 76c74df71a
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
5 changed files with 41 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
.circleci/config.yml
View file

@ -9,7 +9,7 @@ jobs:
name: Install dependencies name: Install dependencies
command: | command: |
apt-get update apt-get update
apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3-stdeb docker.io python3 python3-pyqt5 python3-appdirs python3-click python3-xdg python3-termcolor apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-termcolor
gem install --no-ri --no-rdoc rake gem install --no-ri --no-rdoc rake
gem install --no-ri --no-rdoc package_cloud gem install --no-ri --no-rdoc package_cloud
- checkout - checkout
@ -33,7 +33,7 @@ jobs:
name: Install dependencies name: Install dependencies
command: | command: |
apt-get update apt-get update
apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3-stdeb docker.io python3 python3-pyqt5 python3-appdirs python3-click python3-xdg python3-termcolor apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-termcolor
gem install --no-ri --no-rdoc rake gem install --no-ri --no-rdoc rake
gem install --no-ri --no-rdoc package_cloud gem install --no-ri --no-rdoc package_cloud
- checkout - checkout
@ -58,7 +58,7 @@ jobs:
command: | command: |
export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true
apt-get update apt-get update
apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3-stdeb docker.io python3 python3-pyqt5 python3-appdirs python3-click python3-xdg python3-termcolor apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-termcolor
gem install -N rake gem install -N rake
gem install -N package_cloud gem install -N package_cloud
- checkout - checkout
@ -83,7 +83,7 @@ jobs:
command: | command: |
export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true
apt-get update apt-get update
apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3-stdeb docker.io python3 python3-pyqt5 python3-appdirs python3-click python3-xdg python3-termcolor apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-termcolor
gem install -N rake gem install -N rake
gem install -N package_cloud gem install -N package_cloud
- checkout - checkout
@ -107,7 +107,7 @@ jobs:
name: Install dependencies name: Install dependencies
command: | command: |
apt-get update apt-get update
apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3-stdeb docker.io python3 python3-pyqt5 python3-appdirs python3-click python3-xdg python3-termcolor apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-termcolor
gem install --no-ri --no-rdoc rake gem install --no-ri --no-rdoc rake
gem install --no-ri --no-rdoc package_cloud gem install --no-ri --no-rdoc package_cloud
- checkout - checkout
@ -131,7 +131,7 @@ jobs:
name: Install dependencies name: Install dependencies
command: | command: |
apt-get update apt-get update
apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3-stdeb docker.io python3 python3-pyqt5 python3-appdirs python3-click python3-xdg python3-termcolor apt-get install -y git ssh ruby-dev rubygems python-all dh-python python3 python3-stdeb python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets python3-appdirs python3-click python3-xdg python3-requests python3-termcolor
gem install -N rake gem install -N rake
gem install -N package_cloud gem install -N package_cloud
- checkout - checkout
@ -147,28 +147,6 @@ jobs:
package_cloud push firstlookmedia/code/debian/bullseye deb_dist/dangerzone_${VERSION}-1_all.deb package_cloud push firstlookmedia/code/debian/bullseye deb_dist/dangerzone_${VERSION}-1_all.deb
package_cloud push firstlookmedia/code/debian/bullseye deb_dist/dangerzone_${VERSION}-1.dsc package_cloud push firstlookmedia/code/debian/bullseye deb_dist/dangerzone_${VERSION}-1.dsc
build-fedora-30:
docker:
- image: fedora:30
steps:
- run:
name: Install dependencies
command: |
dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build qt5-devel python3-qt5 python3-appdirs python3-click python3-pyxdg python3-requests docker python3-termcolor
gem install package_cloud
- checkout
- run:
name: Create the .rpm package
command: |
./install/linux/build_rpm.py
dnf install -y dist/dangerzone-*-1.noarch.rpm
- run:
name: Deploy to packagecloud.io
command: |
VERSION=$(cat dangerzone/__init__.py |grep "dangerzone_version = " |cut -d '"' -f2)
package_cloud push firstlookmedia/code/fedora/30 dist/dangerzone-${VERSION}-1.noarch.rpm
package_cloud push firstlookmedia/code/fedora/30 dist/dangerzone-${VERSION}-1.src.rpm
build-fedora-31: build-fedora-31:
docker: docker:
- image: fedora:31 - image: fedora:31
@ -176,7 +154,7 @@ jobs:
- run: - run:
name: Install dependencies name: Install dependencies
command: | command: |
dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build qt5-devel python3-qt5 python3-appdirs python3-click python3-pyxdg python3-requests docker python3-termcolor dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build python3-pyside2 python3-appdirs python3-click python3-pyxdg python3-requests python3-termcolor
gem install package_cloud gem install package_cloud
- checkout - checkout
- run: - run:
@ -198,7 +176,7 @@ jobs:
- run: - run:
name: Install dependencies name: Install dependencies
command: | command: |
dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build qt5-devel python3-qt5 python3-appdirs python3-click python3-pyxdg python3-requests docker python3-termcolor dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build python3-pyside2 python3-appdirs python3-click python3-pyxdg python3-requests python3-termcolor
gem install package_cloud gem install package_cloud
- checkout - checkout
- run: - run:
@ -213,6 +191,28 @@ jobs:
package_cloud push firstlookmedia/code/fedora/32 dist/dangerzone-${VERSION}-1.noarch.rpm package_cloud push firstlookmedia/code/fedora/32 dist/dangerzone-${VERSION}-1.noarch.rpm
package_cloud push firstlookmedia/code/fedora/32 dist/dangerzone-${VERSION}-1.src.rpm package_cloud push firstlookmedia/code/fedora/32 dist/dangerzone-${VERSION}-1.src.rpm
build-fedora-33:
docker:
- image: fedora:33
steps:
- run:
name: Install dependencies
command: |
dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build python3-pyside2 python3-appdirs python3-click python3-pyxdg python3-requests python3-termcolor
gem install package_cloud
- checkout
- run:
name: Create the .rpm package
command: |
./install/linux/build_rpm.py
dnf install -y dist/dangerzone-*-1.noarch.rpm
- run:
name: Deploy to packagecloud.io
command: |
VERSION=$(cat dangerzone/__init__.py |grep "dangerzone_version = " |cut -d '"' -f2)
package_cloud push firstlookmedia/code/fedora/33 dist/dangerzone-${VERSION}-1.noarch.rpm
package_cloud push firstlookmedia/code/fedora/33 dist/dangerzone-${VERSION}-1.src.rpm
workflows: workflows:
version: 2 version: 2
build-tags: build-tags:
@ -253,12 +253,6 @@ workflows:
only: /^v.*/ only: /^v.*/
branches: branches:
ignore: /.*/ ignore: /.*/
- build-fedora-30:
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
- build-fedora-31: - build-fedora-31:
filters: filters:
tags: tags:
@ -271,3 +265,9 @@ workflows:
only: /^v.*/ only: /^v.*/
branches: branches:
ignore: /.*/ ignore: /.*/
- build-fedora-33:
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/

4
BUILD.md
View file

@ -27,7 +27,7 @@ Create a .deb:
Install dependencies: Install dependencies:
```sh ```sh
sudo dnf install -y rpm-build python3 python3-qt5 python3-appdirs python3-click python3-pyxdg python3-requests, python3-termcolor sudo dnf install -y rpm-build python3 python3-pyside2 python3-appdirs python3-click python3-pyxdg python3-requests python3-termcolor
``` ```
You also need docker, either by installing the `docker` package, or by installing `docker-ce` by following [these instructions](https://docs.docker.com/install/linux/docker-ce/fedora/). You also need docker, either by installing the `docker` package, or by installing `docker-ce` by following [these instructions](https://docs.docker.com/install/linux/docker-ce/fedora/).
@ -52,8 +52,6 @@ Install python@3.7 (PyInstaller doesn't support newer versions yet) and other de
brew install python@3.7 create-dmg graphicsmagick imagemagick brew install python@3.7 create-dmg graphicsmagick imagemagick
``` ```
Download and install Python 3.9.0 from https://www.python.org/downloads/release/python-379/. I downloaded `python-3.7.9-macosx10.9.pkg`. (PyInstaller does not support the latest version of Python yet.)
If you don't have it already, install poetry (`pip3 install --user poetry`). Then install dependencies: If you don't have it already, install poetry (`pip3 install --user poetry`). Then install dependencies:
```sh ```sh

3
CHANGELOG.md
View file

@ -3,8 +3,9 @@
## dangerzone 0.1.4 ## dangerzone 0.1.4
- Suppress confusing stderr output, and fix bug when converting specific documents - Suppress confusing stderr output, and fix bug when converting specific documents
- Add support for Ubuntu 20.10, Fedora 32 - Add support for Ubuntu 20.10, Fedora 32, Fedora 33
- Switch from PyQt5 to PySide2 - Switch from PyQt5 to PySide2
- Improve Windows and Mac packaging
## dangerzone 0.1.3 ## dangerzone 0.1.3

2
install/linux/build_rpm.py
View file

@ -31,7 +31,7 @@ def main():
print("* Building RPM package") print("* Building RPM package")
subprocess.run( subprocess.run(
"python3 setup.py bdist_rpm --requires='python3-qt5,python3-appdirs,python3-click,python3-pyxdg,python3-requests,python3-termcolor,(docker or docker-ce)'", "python3 setup.py bdist_rpm --requires='python3-pyside2,python3-appdirs,python3-click,python3-pyxdg,python3-requests,python3-termcolor,(docker or docker-ce)'",
shell=True, shell=True,
cwd=root, cwd=root,
check=True, check=True,

2
stdeb.cfg
View file

@ -1,6 +1,6 @@
[DEFAULT] [DEFAULT]
Package3: dangerzone Package3: dangerzone
Depends3: python3, python3-pyside2.qtcore python3-pyside2.qtgui python3-pyside2.qtwidgets, python3-appdirs, python3-click, python3-xdg, python3-requests, python3-termcolor Depends3: python3, python3-pyside2.qtcore, python3-pyside2.qtgui, python3-pyside2.qtwidgets, python3-appdirs, python3-click, python3-xdg, python3-requests, python3-termcolor
Build-Depends: dh-python, python3, python3-all Build-Depends: dh-python, python3, python3-all
Suite: bionic Suite: bionic
X-Python3-Version: >= 3.6 X-Python3-Version: >= 3.6