From a6770865c59d26d51dcd1d1be40120b3c77c3d23 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Wed, 24 Nov 2021 13:52:19 -0800 Subject: [PATCH] Make convert-test-docs use the same docker image as everything else --- .circleci/config.yml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bef8f16..e90c07c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,12 +102,21 @@ jobs: machine: image: ubuntu-2004:202111-01 steps: - - run: *install-dependencies-deb - - checkout - run: - name: Build image with podman - command: ./install/linux/build-image.sh - - run: *build-deb + name: Install dependencies as root + command: | + export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true + sudo apt-get update + sudo apt-get install -y git ssh podman 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-colorama + - checkout + - restore_cache: *restore-cache + - run: *copy-image + - run: + name: Build the .deb package and install it as root + command: | + ./install/linux/build-deb.py + sudo dpkg -i deb_dist/dangerzone_*-1_all.deb + ls -lh deb_dist/dangerzone_*-1_all.deb - run: name: Convert each test document command: | @@ -338,8 +347,10 @@ workflows: build: jobs: - - convert-test-docs - build-container-image + - convert-test-docs: + requires: + - build-container-image - build-ubuntu-impish: requires: - build-container-image