Skip to content
This repository has been archived by the owner on Feb 1, 2023. It is now read-only.

Commit

Permalink
Merge pull request #205 from firstlookmedia/develop
Browse files Browse the repository at this point in the history 
Version 0.3.6
  • Loading branch information
@micahflee
micahflee authored Feb 5, 2021
2 parents 819a170 + d041089 commit 466c9ed
Show file tree
Hide file tree
Showing 22 changed files with 608 additions and 512 deletions.
131 changes: 65 additions & 66 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@ jobs:

test:
docker:
- image: circleci/python:3.7-buster
- image: circleci/python:3.8-buster
steps:
- run:
name: Install dependencies
command: |
sudo apt-get update
sudo apt-get install -y gnupg2 python3-pyqt5 tor xvfb
sudo apt-get install -y gnupg2 tor xvfb
- run:
name: Start tor service
command: sudo service tor start
- checkout
- run:
name: Install python dependencies
command: pipenv install --dev
command: poetry install
- run:
name: Run tests
command: pipenv run xvfb-run -s "-screen 0 1280x1024x24" python setup.py pytest
command: poetry run xvfb-run -s "-screen 0 1280x1024x24" python setup.py pytest

build-ubuntu-bionic:
build-ubuntu-focal:
docker:
- image: ubuntu:18.04
- image: ubuntu:20.04
steps:
- run:
name: Install dependencies
command: |
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y git ssh ruby-dev rubygems build-essential fakeroot python-all python3-all dh-python python3-pyqt5 python3-stdeb python3-requests python3-socks python3-packaging python3-dateutil python3-pytest python3-pytest-runner gnupg2
gem install --no-ri --no-rdoc rake
gem install --no-ri --no-rdoc package_cloud
DEBIAN_FRONTEND=noninteractive apt-get install -y git ssh ruby-dev rubygems build-essential fakeroot python-all dh-python python3-pytest python3-pytest-runner python3-stdeb python3-pyside2.qtcore python3-pyside2.qtwidgets python3-pyside2.qtgui python3-requests python3-socks python3-packaging python3-dateutil gnupg2
gem install -N rake
gem install -N package_cloud
- checkout
- run:
name: Create the .deb package
Expand All @@ -43,20 +43,20 @@ jobs:
name: Deploy to packagecloud.io
command: |
VERSION=$(cat share/version |cut -dv -f2)
package_cloud push firstlookmedia/code/ubuntu/bionic deb_dist/gpgsync_${VERSION}-1_all.deb
package_cloud push firstlookmedia/code/ubuntu/bionic deb_dist/gpgsync_${VERSION}-1.dsc
package_cloud push firstlookmedia/code/ubuntu/focal deb_dist/gpgsync_${VERSION}-1_all.deb
package_cloud push firstlookmedia/code/ubuntu/focal deb_dist/gpgsync_${VERSION}-1.dsc
build-ubuntu-disco:
build-ubuntu-groovy:
docker:
- image: ubuntu:19.04
- image: ubuntu:20.10
steps:
- run:
name: Install dependencies
command: |
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y git ssh ruby-dev rubygems build-essential fakeroot python-all python3-all dh-python python3-pyqt5 python3-stdeb python3-requests python3-socks python3-packaging python3-dateutil python3-pytest python3-pytest-runner gnupg2
gem install --no-ri --no-rdoc rake
gem install --no-ri --no-rdoc package_cloud
DEBIAN_FRONTEND=noninteractive apt-get install -y git ssh ruby-dev rubygems build-essential fakeroot python-all dh-python python3-pytest python3-pytest-runner python3-stdeb python3-pyside2.qtcore python3-pyside2.qtwidgets python3-pyside2.qtgui python3-requests python3-socks python3-packaging python3-dateutil gnupg2
gem install -N rake
gem install -N package_cloud
- checkout
- run:
name: Create the .deb package
Expand All @@ -67,18 +67,18 @@ jobs:
name: Deploy to packagecloud.io
command: |
VERSION=$(cat share/version |cut -dv -f2)
package_cloud push firstlookmedia/code/ubuntu/disco deb_dist/gpgsync_${VERSION}-1_all.deb
package_cloud push firstlookmedia/code/ubuntu/disco deb_dist/gpgsync_${VERSION}-1.dsc
package_cloud push firstlookmedia/code/ubuntu/groovy deb_dist/gpgsync_${VERSION}-1_all.deb
package_cloud push firstlookmedia/code/ubuntu/groovy deb_dist/gpgsync_${VERSION}-1.dsc
build-ubuntu-eoan:
build-debian-buster:
docker:
- image: ubuntu:19.10
- image: debian:buster
steps:
- run:
name: Install dependencies
command: |
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y git ssh ruby-dev rubygems build-essential fakeroot python-all python3-all dh-python python3-pyqt5 python3-stdeb python3-requests python3-socks python3-packaging python3-dateutil python3-pytest python3-pytest-runner gnupg2
DEBIAN_FRONTEND=noninteractive apt-get install -y git ssh ruby-dev rubygems build-essential fakeroot python-all dh-python python3-pytest python3-pytest-runner python3-stdeb python3-pyside2.qtcore python3-pyside2.qtwidgets python3-pyside2.qtgui python3-requests python3-socks python3-packaging python3-dateutil gnupg2
gem install --no-ri --no-rdoc rake
gem install --no-ri --no-rdoc package_cloud
- checkout
Expand All @@ -91,20 +91,20 @@ jobs:
name: Deploy to packagecloud.io
command: |
VERSION=$(cat share/version |cut -dv -f2)
package_cloud push firstlookmedia/code/ubuntu/eoan deb_dist/gpgsync_${VERSION}-1_all.deb
package_cloud push firstlookmedia/code/ubuntu/eoan deb_dist/gpgsync_${VERSION}-1.dsc
package_cloud push firstlookmedia/code/debian/buster deb_dist/gpgsync_${VERSION}-1_all.deb
package_cloud push firstlookmedia/code/debian/buster deb_dist/gpgsync_${VERSION}-1.dsc
build-debian-buster:
build-debian-bullseye:
docker:
- image: debian:buster
- image: debian:bullseye
steps:
- run:
name: Install dependencies
command: |
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y git ssh ruby-dev rubygems build-essential fakeroot python-all python3-all dh-python python3-pyqt5 python3-stdeb python3-requests python3-socks python3-packaging python3-dateutil python3-pytest python3-pytest-runner gnupg2
gem install --no-ri --no-rdoc rake
gem install --no-ri --no-rdoc package_cloud
DEBIAN_FRONTEND=noninteractive apt-get install -y git ssh ruby-dev rubygems build-essential fakeroot python-all dh-python python3-pytest python3-pytest-runner python3-stdeb python3-pyside2.qtcore python3-pyside2.qtwidgets python3-pyside2.qtgui python3-requests python3-socks python3-packaging python3-dateutil gnupg2
gem install -N rake
gem install -N package_cloud
- checkout
- run:
name: Create the .deb package
Expand All @@ -115,41 +115,39 @@ jobs:
name: Deploy to packagecloud.io
command: |
VERSION=$(cat share/version |cut -dv -f2)
package_cloud push firstlookmedia/code/debian/buster deb_dist/gpgsync_${VERSION}-1_all.deb
package_cloud push firstlookmedia/code/debian/buster deb_dist/gpgsync_${VERSION}-1.dsc
package_cloud push firstlookmedia/code/debian/bullseye deb_dist/gpgsync_${VERSION}-1_all.deb
package_cloud push firstlookmedia/code/debian/bullseye deb_dist/gpgsync_${VERSION}-1.dsc
build-debian-bullseye:
build-fedora-31:
docker:
- image: debian:bullseye
- image: fedora:31
steps:
- run:
name: Install dependencies
command: |
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y git ssh ruby-dev rubygems build-essential fakeroot python-all python3-all dh-python python3-pyqt5 python3-stdeb python3-requests python3-socks python3-packaging python3-dateutil python3-pytest python3-pytest-runner gnupg2
gem install --no-ri --no-rdoc rake
gem install --no-ri --no-rdoc package_cloud
dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build python3-pytest-runner python3-pyside2 python3-requests python3-packaging python3-dateutil gnupg2
gem install package_cloud
- checkout
- run:
name: Create the .deb package
name: Create the .rpm package
command: |
./install/build_deb.sh
dpkg -i deb_dist/gpgsync_*.deb
./install/build_rpm.sh
dnf install -y dist/gpgsync-*-1.noarch.rpm
- run:
name: Deploy to packagecloud.io
command: |
VERSION=$(cat share/version |cut -dv -f2)
package_cloud push firstlookmedia/code/debian/bullseye deb_dist/gpgsync_${VERSION}-1_all.deb
package_cloud push firstlookmedia/code/debian/bullseye deb_dist/gpgsync_${VERSION}-1.dsc
package_cloud push firstlookmedia/code/fedora/31 dist/gpgsync-${VERSION}-1.noarch.rpm
package_cloud push firstlookmedia/code/fedora/31 dist/gpgsync-${VERSION}-1.src.rpm
build-fedora-30:
build-fedora-32:
docker:
- image: fedora:30
- 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-requests python3-pytest-runner python3-packaging python3-dateutil gnupg2
dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build python3-pytest-runner python3-pyside2 python3-requests python3-packaging python3-dateutil gnupg2
gem install package_cloud
- checkout
- run:
Expand All @@ -161,17 +159,17 @@ jobs:
name: Deploy to packagecloud.io
command: |
VERSION=$(cat share/version |cut -dv -f2)
package_cloud push firstlookmedia/code/fedora/30 dist/gpgsync-${VERSION}-1.noarch.rpm
package_cloud push firstlookmedia/code/fedora/30 dist/gpgsync-${VERSION}-1.src.rpm
package_cloud push firstlookmedia/code/fedora/32 dist/gpgsync-${VERSION}-1.noarch.rpm
package_cloud push firstlookmedia/code/fedora/32 dist/gpgsync-${VERSION}-1.src.rpm
build-fedora-31:
build-fedora-33:
docker:
- image: fedora:31
- image: fedora:33
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-requests python3-pytest-runner python3-packaging python3-dateutil gnupg2
dnf install -y git openssh ruby-devel make automake gcc gcc-c++ rpm-build python3-pytest-runner python3-pyside2 python3-requests python3-packaging python3-dateutil gnupg2
gem install package_cloud
- checkout
- run:
Expand All @@ -183,8 +181,9 @@ jobs:
name: Deploy to packagecloud.io
command: |
VERSION=$(cat share/version |cut -dv -f2)
package_cloud push firstlookmedia/code/fedora/31 dist/gpgsync-${VERSION}-1.noarch.rpm
package_cloud push firstlookmedia/code/fedora/31 dist/gpgsync-${VERSION}-1.src.rpm
package_cloud push firstlookmedia/code/fedora/33 dist/gpgsync-${VERSION}-1.noarch.rpm
package_cloud push firstlookmedia/code/fedora/33 dist/gpgsync-${VERSION}-1.src.rpm
workflows:
version: 2
Expand All @@ -193,24 +192,18 @@ workflows:
- test
build-tags:
jobs:
- build-ubuntu-bionic:
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
- build-ubuntu-disco:
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
- build-ubuntu-eoan:
- build-ubuntu-focal:
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
# - build-ubuntu-groovy:
# filters:
# tags:
# only: /^v.*/
# branches:
# ignore: /.*/
- build-debian-buster:
filters:
tags:
Expand All @@ -223,15 +216,21 @@ workflows:
only: /^v.*/
branches:
ignore: /.*/
- build-fedora-30:
- build-fedora-31:
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
- build-fedora-31:
- build-fedora-32:
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
# - build-fedora-33:
# filters:
# tags:
# only: /^v.*/
# branches:
# ignore: /.*/
Loading

0 comments on commit 466c9ed

Please sign in to comment.