Revert "TEMPORARY: pins PR commit for securedrop-proxy"

This reverts commit 3c53f5f.
freedomofpress · Apr 14, 2021 · 26518bb · 26518bb
1 parent 3c53f5f
commit 26518bb
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -83,7 +83,6 @@ common-steps:
       command: |
         mkdir ~/packaging && cd ~/packaging
         git clone https://github.com/freedomofpress/securedrop-proxy.git
-        git -C securedrop-proxy checkout update_pyyaml_wheel
         export PKG_NAME="securedrop-proxy"
         # Enable access to this env var in subsequent run steps
         echo $PKG_NAME > ~/packaging/sd_package_name

diff --git a/scripts/build-sync-wheels b/scripts/build-sync-wheels
@@ -49,8 +49,6 @@ def main():
         git_clone_directory = tempfile.mkdtemp(prefix=os.path.basename(args.p))
         cmd = f"git clone {args.p} {git_clone_directory}".split()
         subprocess.check_call(cmd)
-        if "securedrop-proxy" in args.p:
-            subprocess.check_call(f"git -C {git_clone_directory} checkout update_pyyaml_wheel".split())
         args.p = git_clone_directory
     else:
         git_clone_directory = ""

diff --git a/tests/test_reproducible_debian_packages.py b/tests/test_reproducible_debian_packages.py
@@ -6,7 +6,7 @@
 PACKAGE_BUILD_TARGETS = {
     "securedrop-client": "main",
     "securedrop-log": "main",
-    "securedrop-proxy": "update_pyyaml_wheel",
+    "securedrop-proxy": "main",
     "securedrop-export": "main",
 }