FIXUP: Restore previous behavior

This commit is contained in:
Alex Pyrgiotis 2024-10-08 17:05:59 +03:00
parent 4dcca91a05
commit e5fd1e91d5
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
2 changed files with 8 additions and 2 deletions

View file

@ -210,6 +210,7 @@ jobs:
run --dev --no-gui ./dangerzone/install/linux/build-deb.py run --dev --no-gui ./dangerzone/install/linux/build-deb.py
- name: Upload Dangerzone .deb - name: Upload Dangerzone .deb
if: matrix.distro == 'debian' && matrix.version == 'bookworm'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: dangerzone-${{ matrix.distro }}-${{ matrix.version }}.deb name: dangerzone-${{ matrix.distro }}-${{ matrix.version }}.deb
@ -250,7 +251,7 @@ jobs:
- name: Download Dangerzone .deb - name: Download Dangerzone .deb
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: dangerzone-${{ matrix.distro }}-${{ matrix.version }}.deb name: dangerzone-debian-bookworm.deb
path: "deb_dist/" path: "deb_dist/"
- name: Build end-user environment - name: Build end-user environment

View file

@ -1,6 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import argparse import argparse
import os
import subprocess import subprocess
import sys import sys
from pathlib import Path from pathlib import Path
@ -41,7 +42,11 @@ def main():
"--requirement", "--requirement",
"/proc/self/fd/0", # XXX: pip does not read requirements.txt from stdin "/proc/self/fd/0", # XXX: pip does not read requirements.txt from stdin
] ]
subprocess.check_output(cmd, input=container_requirements_txt) subprocess.run(cmd, check=True, input=container_requirements_txt)
if not os.listdir(args.dest):
print(f">>> Failed to vendor PyMuPDF under '{args.dest}'", file=sys.stderr)
print(f">>> Successfully vendored PyMuPDF under '{args.dest}'", file=sys.stderr) print(f">>> Successfully vendored PyMuPDF under '{args.dest}'", file=sys.stderr)