Skip to content

Commit fcebf80

Browse files
committed
Use machine executor to allow reprotests to setarch
setarch is not permittied in the docker container. Because CircleCI only supports Ubuntu VM targets [1], we must add the Bionic sources to install dh-virtualenv under Focal as no installation candidate exists for that distribution in upstream repos. [1] : https://circleci.com/docs/2.0/configuration-reference/#available-machine-images
1 parent 8340b0e commit fcebf80

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ common-steps:
281281
version: 2.1
282282
jobs:
283283
tests:
284-
docker:
285-
- image: circleci/python:3.7-buster
284+
machine:
285+
image: ubuntu-2004:202010-01
286286
steps:
287287
- checkout
288288
- run:

scripts/install-deps

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
# Installs required dependencies for building SecureDrop Worsktation packages.
33
# Assumes a Debian 10 machine, ideally a Qubes AppVM.
44

5+
# If running in CI, we need to add the Ubuntu Bionic repo to download dh-virtualenv
6+
if [[ -v CIRCLE_BUILD_URL ]]; then
7+
echo "deb http://archive.ubuntu.com/ubuntu/ bionic universe" | sudo tee -a /etc/apt/sources.list
8+
fi
9+
510
sudo apt-get update
611
sudo apt-get install \
712
build-essential \

0 commit comments

Comments
 (0)