Merge pull request #7347 from freedomofpress/pub-dbgsym

Publish dbgsym packages

builder/build-debs-securedrop.sh

@@ -30,6 +30,10 @@ dpkg-buildpackage -us -uc
 # Copy the built artifacts back and print checksums
 source /etc/os-release
 mkdir -p "/src/build/${VERSION_CODENAME}"
-mv -v ../*.{buildinfo,changes,deb,tar.gz} "/src/build/${VERSION_CODENAME}"
+mv -v ../*.{buildinfo,changes,deb,ddeb,tar.gz} "/src/build/${VERSION_CODENAME}"
 cd "/src/build/${VERSION_CODENAME}"
+# Rename "ddeb" packages to just "deb"
+for file in *.ddeb; do
+    mv "$file" "${file%.ddeb}.deb";
+done
 sha256sum ./*

builder/tests/test_securedrop_deb_package.py

@@ -19,11 +19,11 @@ def securedrop_app_code_contents() -> str:
     """
     Returns the content listing of the securedrop-app-code Debian package.
     """
-    try:
-        path = [pkg for pkg in DEB_PATHS if pkg.name.startswith("securedrop-app-code")][0]
-    except IndexError:
-        raise RuntimeError("Unable to find securedrop-app-code package in build/ folder")
-    return subprocess.check_output(["dpkg-deb", "--contents", path]).decode()
+    for pkg in DEB_PATHS:
+        if pkg.name.startswith("securedrop-app-code") and "dbgsym" not in pkg.name:
+            return subprocess.check_output(["dpkg-deb", "--contents", pkg]).decode()
+
+    raise RuntimeError("Unable to find securedrop-app-code package in build/ folder")
 
 
 @pytest.mark.parametrize("deb", DEB_PATHS)
@@ -55,7 +55,10 @@ def test_deb_package_contains_expected_conffiles(deb: Path):
 
     The same applies to `securedrop-config` too.
     """
-    if not deb.name.startswith(("securedrop-app-code", "securedrop-config")):
+    if (
+        not deb.name.startswith(("securedrop-app-code", "securedrop-config"))
+        or "dbgsym" in deb.name
+    ):
         return
 
     with tempfile.TemporaryDirectory() as tmpdir: