Remove ubuntu 19.04 from circleci, and update gem to use newer flags for ubuntu 20.04 and debian bullseye

This commit is contained in:
Micah Lee 2020-09-25 14:23:34 -07:00
parent 753134dc3f
commit 94507d4e13
No known key found for this signature in database
GPG key ID: 403C2657CD994F73

View file

@ -1,7 +1,6 @@
version: 2.1 version: 2.1
jobs: jobs:
build-ubuntu-bionic: build-ubuntu-bionic:
docker: docker:
- image: ubuntu:18.04 - image: ubuntu:18.04
@ -26,30 +25,6 @@ jobs:
package_cloud push firstlookmedia/code/ubuntu/bionic deb_dist/dangerzone_${VERSION}-1_all.deb package_cloud push firstlookmedia/code/ubuntu/bionic deb_dist/dangerzone_${VERSION}-1_all.deb
package_cloud push firstlookmedia/code/ubuntu/bionic deb_dist/dangerzone_${VERSION}-1.dsc package_cloud push firstlookmedia/code/ubuntu/bionic deb_dist/dangerzone_${VERSION}-1.dsc
build-ubuntu-disco:
docker:
- image: ubuntu:19.04
steps:
- run:
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
gem install --no-ri --no-rdoc rake
gem install --no-ri --no-rdoc 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/disco deb_dist/dangerzone_${VERSION}-1_all.deb
package_cloud push firstlookmedia/code/ubuntu/disco deb_dist/dangerzone_${VERSION}-1.dsc
build-ubuntu-eoan: build-ubuntu-eoan:
docker: docker:
- image: ubuntu:19.10 - image: ubuntu:19.10
@ -84,8 +59,8 @@ jobs:
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 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
gem install --no-ri --no-rdoc rake gem install -N rake
gem install --no-ri --no-rdoc package_cloud gem install -N package_cloud
- checkout - checkout
- run: - run:
name: Create the .deb package name: Create the .deb package
@ -132,8 +107,8 @@ jobs:
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 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
gem install --no-ri --no-rdoc rake gem install -N rake
gem install --no-ri --no-rdoc package_cloud gem install -N package_cloud
- checkout - checkout
- run: - run:
name: Create the .deb package name: Create the .deb package
@ -201,12 +176,6 @@ workflows:
only: /^v.*/ only: /^v.*/
branches: branches:
ignore: /.*/ ignore: /.*/
- build-ubuntu-disco:
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
- build-ubuntu-eoan: - build-ubuntu-eoan:
filters: filters:
tags: tags: