Skip to content

Commit

Permalink
Merge pull request #699 from freedomofpress/ci-fix
Browse files Browse the repository at this point in the history
fix ci after migrating our pip mirror to git-lfs
  • Loading branch information
kushaldas authored Jan 16, 2020
2 parents 6be344c + bcab70a commit 47434fa
Showing 1 changed file with 3 additions and 22 deletions.
25 changes: 3 additions & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ common-steps:
name: Install Debian packaging dependencies and download wheels
command: |
mkdir ~/packaging && cd ~/packaging
git config --global --unset url.ssh://[email protected]
git clone https://github.com/freedomofpress/securedrop-debian-packaging.git
cd securedrop-debian-packaging
make install-deps && make fetch-wheels
make install-deps
PKG_DIR=~/project make requirements
- &verify_requirements
Expand Down Expand Up @@ -65,16 +66,6 @@ common-steps:
version: 2
jobs:
build-stretch:
docker:
- image: circleci/python:3.5-stretch
steps:
- checkout
- *install_packaging_dependencies
- *verify_requirements
- *make_source_tarball
- *build_debian_package

build-buster:
docker:
- image: circleci/python:3.7-buster
Expand All @@ -85,16 +76,6 @@ jobs:
- *make_source_tarball
- *build_debian_package

test-stretch:
docker:
- image: circleci/python:3.5-stretch
steps:
- checkout
- run: sudo apt-get install -y sqlite3 libqt5x11extras5
- *run_tests
- *check_python_dependencies_for_vulns
- *run_static_analysis

test-buster:
docker:
- image: circleci/python:3.7-buster
Expand All @@ -109,5 +90,5 @@ workflows:
version: 2
securedrop_client_ci:
jobs:
- test-stretch
- test-buster
- build-buster

0 comments on commit 47434fa

Please sign in to comment.