From 0c33802fa9658eec3c2bbdd1d91b4d264f079d72 Mon Sep 17 00:00:00 2001 From: Allie Crevier Date: Thu, 26 May 2022 15:08:26 -0700 Subject: [PATCH] fix circleci bullseye permission issue Signed-off-by: Allie Crevier --- .circleci/config.yml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c2cb0b4c9..f1310a120 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,8 @@ common-steps: name: Install base dependencies for Bullseye python command: | set -e - apt-get update && apt-get install -y sudo make git gnupg + pip uninstall virtualenv -y || true + sudo apt update && sudo apt install -y make git gnupg - &install_deps_on_buster run: @@ -52,6 +53,20 @@ common-steps: make safety - &install_packaging_dependencies + run: + name: Install Debian packaging dependencies and download wheels + command: | + set -x + mkdir ~/packaging && cd ~/packaging + # local builds may not have an ssh url, so || true + git config --global --unset url.ssh://git@github.com.insteadof || true + git clone https://github.com/freedomofpress/securedrop-debian-packaging.git + cd securedrop-debian-packaging + sudo apt update && sudo apt install -y make + make install-deps + PKG_DIR=~/project make requirements + + - &install_packaging_dependencies_buster run: name: Install Debian packaging dependencies and download wheels command: | @@ -103,7 +118,7 @@ jobs: steps: - *install_deps - checkout - - run: apt-get update && apt-get install -y sqlite3 libqt5x11extras5 xvfb python3-tk python3-dev + - run: sudo apt update && sudo apt install -y sqlite3 libqt5x11extras5 xvfb python3-tk python3-dev - *run_tests - store_test_results: path: test-results @@ -116,7 +131,7 @@ jobs: steps: - *install_deps_on_buster - checkout - - *install_packaging_dependencies + - *install_packaging_dependencies_buster - *verify_requirements - *build_debian_package