From 1eaa3ea62aa634e95adad617e0714330f3234350 Mon Sep 17 00:00:00 2001
From: Erik Moeller <erik@freedom.press>
Date: Thu, 11 Apr 2024 17:25:21 -0700
Subject: [PATCH] Migrate `make test` tests to GitHub Actions

---
 .circleci/config.yml     | 15 ---------------
 .github/workflows/ci.yml | 17 ++++++++++++-----
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1025283..e315bf3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,20 +19,6 @@ common-steps:
 version: 2.1
 
 jobs:
-  lint-and-test:
-    docker:
-      - image: debian:bullseye
-    steps:
-      - checkout
-      - *installdeps
-      - *installtestdeps
-      - run:
-          name: install test requirements, run linters, and run tests
-          command: |
-            source .venv/bin/activate
-            sed -i -re "292s/^(\s+).*\$/\1return _.prepend_to_build_command_raw('')/" /usr/lib/python3/dist-packages/reprotest/build.py
-            make test
-
   reprotest-wheels:
     docker:
       - image: debian:bullseye
@@ -54,7 +40,6 @@ jobs:
 workflows:
   builder_ci:
     jobs:
-      - lint-and-test
       - reprotest-wheels
 
   nightly:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cba9abb..b32b3bd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,11 +8,18 @@ jobs:
     runs-on: ubuntu-latest
     container: debian:bullseye
     steps:
+      - name: Bootstrap Debian system package dependencies
+        run: |
+          apt-get update && apt-get install --yes --no-install-recommends make sudo git git-lfs ca-certificates
       - uses: actions/checkout@v4
-      - name: Install dependencies
+        with:
+          lfs: true
+      - name:  Install additional packages and Python dependencies
         run: |
-          apt-get update && apt-get install --yes --no-install-recommends make python3-pip
-          pip install -r test-requirements.txt
-      - name: Run lint checks
+          # Installs Python & bootstrap wheels, and initializes a virtualenv at .venv
+          make install-deps
+          ./.venv/bin/pip install -r test-requirements.txt
+      - name: Run tests except reprotest
         run: |
-          make lint
\ No newline at end of file
+          . ./.venv/bin/activate
+          make test
\ No newline at end of file