diff --git a/.circleci/config.yml b/.circleci/config.yml index 267d185..dc4f69d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: name: Install dependencies command: | 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 + 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 gem install --no-ri --no-rdoc rake gem install --no-ri --no-rdoc package_cloud - checkout @@ -33,7 +33,7 @@ jobs: name: Install dependencies command: | 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 + 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 gem install --no-ri --no-rdoc rake gem install --no-ri --no-rdoc package_cloud - checkout @@ -58,7 +58,32 @@ jobs: command: | export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true 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 + 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 + gem install -N rake + gem install -N package_cloud + - checkout + - run: + name: Create the .deb package + command: | + ./install/linux/build_deb.py + dpkg -i deb_dist/dangerzone_*-1_all.deb + - run: + name: Deploy to packagecloud.io + command: | + VERSION=$(cat dangerzone/__init__.py |grep "dangerzone_version = " |cut -d '"' -f2) + package_cloud push firstlookmedia/code/ubuntu/focal deb_dist/dangerzone_${VERSION}-1_all.deb + package_cloud push firstlookmedia/code/ubuntu/focal deb_dist/dangerzone_${VERSION}-1.dsc + + build-ubuntu-groovy: + docker: + - image: ubuntu:20.10 + steps: + - run: + name: Install dependencies + command: | + export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true + 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 gem install -N rake gem install -N package_cloud - checkout @@ -82,7 +107,7 @@ jobs: name: Install dependencies command: | 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 + 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 gem install --no-ri --no-rdoc rake gem install --no-ri --no-rdoc package_cloud - checkout @@ -106,7 +131,7 @@ jobs: name: Install dependencies command: | 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 + 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 gem install -N rake gem install -N package_cloud - checkout @@ -129,7 +154,7 @@ jobs: - 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 + 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: @@ -151,7 +176,7 @@ jobs: - 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 + 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: @@ -166,6 +191,28 @@ jobs: package_cloud push firstlookmedia/code/fedora/31 dist/dangerzone-${VERSION}-1.noarch.rpm package_cloud push firstlookmedia/code/fedora/31 dist/dangerzone-${VERSION}-1.src.rpm + build-fedora-32: + docker: + - image: fedora:32 + 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/32 dist/dangerzone-${VERSION}-1.noarch.rpm + package_cloud push firstlookmedia/code/fedora/32 dist/dangerzone-${VERSION}-1.src.rpm + workflows: version: 2 build-tags: @@ -188,6 +235,12 @@ workflows: only: /^v.*/ branches: ignore: /.*/ + - build-ubuntu-groovy: + filters: + tags: + only: /^v.*/ + branches: + ignore: /.*/ - build-debian-buster: filters: tags: @@ -212,3 +265,9 @@ workflows: only: /^v.*/ branches: ignore: /.*/ + - build-fedora-32: + filters: + tags: + only: /^v.*/ + branches: + ignore: /.*/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 4be52e6..e392d6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## dangerzone 0.1.4 + +- Suppress confusing stderr output, and fix bug when converting specific documents +- Add support for Ubuntu 20.10, Fedora 32 + ## dangerzone 0.1.3 - Add support for Ubuntu 20.04 LTS (#79) diff --git a/README.md b/README.md index 2c4ead7..c1c3562 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ _Read more about dangerzone in the blog post [Dangerzone: Working With Suspiciou ## Getting started -- Download [dangerzone 0.1.3 for Mac](https://github.com/firstlookmedia/dangerzone/releases/download/v0.1.3/Dangerzone.0.1.3.dmg) -- Download [dangerzone 0.1.3 for Windows](https://github.com/firstlookmedia/dangerzone/releases/download/v0.1.3/Dangerzone.0.1.3.msi) +- Download [dangerzone 0.1.4 for Mac](https://github.com/firstlookmedia/dangerzone/releases/download/v0.1.4/Dangerzone.0.1.4.dmg) +- Download [dangerzone 0.1.4 for Windows](https://github.com/firstlookmedia/dangerzone/releases/download/v0.1.4/Dangerzone.0.1.4.msi) - See [installing dangerzone](https://github.com/firstlookmedia/dangerzone/wiki/Installing-Dangerzone) on the wiki for Linux repositories You can also install dangerzone for Mac using [Homebrew](https://brew.sh/): `brew cask install dangerzone` diff --git a/dangerzone/__init__.py b/dangerzone/__init__.py index b283ec5..6f08518 100644 --- a/dangerzone/__init__.py +++ b/dangerzone/__init__.py @@ -2,7 +2,7 @@ import os import sys from .container import container_main -dangerzone_version = "0.1.3" +dangerzone_version = "0.1.4" # This is a hack for Windows and Mac to be able to run dangerzone-container, even though # PyInstaller builds a single binary diff --git a/install/windows/Dangerzone.wxs b/install/windows/Dangerzone.wxs index 527a9c6..38c769a 100644 --- a/install/windows/Dangerzone.wxs +++ b/install/windows/Dangerzone.wxs @@ -1,5 +1,5 @@ - + diff --git a/pyproject.toml b/pyproject.toml index b8cd7f1..5aeff75 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dangerzone" -version = "0.1.3" +version = "0.1.4" description = "Take potentially dangerous PDFs, office documents, or images and convert them to a safe PDF" authors = ["Micah Lee "] license = "MIT"