-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #699 from freedomofpress/ci-fix
fix ci after migrating our pip mirror to git-lfs
- Loading branch information
Showing
1 changed file
with
3 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -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 | ||
|
@@ -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 | ||
|
@@ -109,5 +90,5 @@ workflows: | |
version: 2 | ||
securedrop_client_ci: | ||
jobs: | ||
- test-stretch | ||
- test-buster | ||
- build-buster |