From d7fb8f8bae2e1e1f910aa861a8df9729eb594b52 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Tue, 13 Aug 2024 18:07:00 -0400 Subject: [PATCH] Have GHA lint job also run `make verify-mo` This was in the CircleCI job but not GHA. We need to install libarchive for diffoscope to work; added some debugging code to make those types of diffoscope failures easier to understand and debug. --- .github/workflows/ci.yml | 3 ++- devops/scripts/verify-mo.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b85ba33ad5..baa2569db06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - name: Install dependencies run: | DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install --yes --no-install-recommends \ - build-essential python3-virtualenv python3-dev enchant file apache2-dev jq + build-essential python3-virtualenv python3-dev enchant file apache2-dev jq libarchive-tools virtualenv .venv # TODO: this should be one step, but there are too many conflicting dependencies ./.venv/bin/pip install -r securedrop/requirements/python3/test-requirements.txt @@ -28,6 +28,7 @@ jobs: git config --global --add safe.directory $GITHUB_WORKSPACE source .venv/bin/activate make lint + make verify-mo rust: runs-on: ubuntu-latest diff --git a/devops/scripts/verify-mo.py b/devops/scripts/verify-mo.py index 52ad7e546e1..8309e8f5c85 100755 --- a/devops/scripts/verify-mo.py +++ b/devops/scripts/verify-mo.py @@ -138,6 +138,8 @@ def verify(self) -> None: # or 1 (differences); anything else is an error. test = self.diffoscope_call(Path(self.mo.fpath), Path(self.mo_target), filtered=False) if test.returncode not in [0, 1]: + print(test.stdout.decode()) + print(test.stderr.decode()) test.check_returncode() # With filtering, since diffoscope will return 1 on differences