Merge 178364e3a7 into 5744215d99

.github/workflows/check_pr.yml

@@ -1,35 +0,0 @@
-name: Check branch conformity
-on:
-  pull_request:
-
-jobs:
-  prevent-fixup-commits:
-      runs-on: ubuntu-latest
-      env:
-        target: debian-bookworm
-        distro: debian
-        version: bookworm
-      steps:
-        - name: Checkout
-          uses: actions/checkout@v4
-        - name: prevent fixup commits
-          run: |
-            git fetch origin
-            git status
-            git log --pretty=format:%s origin/main..HEAD | grep -ie '^fixup\|^wip' && exit 1 || true
-
-  check-changelog:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: ensure CHANGELOG.md is populated
-        env:
-          BASE_REF: ${{ github.event.pull_request.base.ref }}
-        shell: bash
-        run: |
-          if git diff --exit-code "origin/${BASE_REF}" -- CHANGELOG.md; then
-              echo "::warning::No CHANGELOG.md modifications were found in this pull request."
-          fi

.github/workflows/check_push.yml

@@ -0,0 +1,19 @@
+name: Check branch conformity
+on:
+  pull_request:
+
+jobs:
+  prevent-fixup-commits:
+      runs-on: ubuntu-latest
+      env:
+        target: debian-bookworm
+        distro: debian
+        version: bookworm
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v4
+        - name: prevent fixup commits
+          run: |
+            git fetch origin
+            git status
+            git log --pretty=format:%s origin/main..HEAD | grep -ie '^fixup\|^wip' && exit 1 || true

.github/workflows/ci.yml

@@ -68,12 +68,6 @@ jobs:
           sudo apt-get install -y python3-poetry
           python3 ./install/common/build-image.py
 
-      - name: Upload container image
-        uses: actions/upload-artifact@v4
-        with:
-          name: container.tar.gz
-          path: share/container.tar.gz
-
   download-tessdata:
     name: Download and cache Tesseract data
     runs-on: ubuntu-latest
@@ -126,13 +120,6 @@ jobs:
       - name: Build the MSI installer
         # NOTE: This also builds the .exe internally.
         run: poetry run .\install\windows\build-app.bat
-      - name: Upload MSI installer
-        uses: actions/upload-artifact@v4
-        with:
-          name: Dangerzone.msi
-          path: "dist/Dangerzone.msi"
-          if-no-files-found: error
-          compression-level: 0
 
   macOS:
     name: "macOS (${{ matrix.arch }})"
@@ -164,15 +151,7 @@ jobs:
       - run: poetry install
       - name: Run CLI tests
         run: poetry run make test
-      - name: Build macOS app
+
-        run: poetry run python ./install/macos/build-app.py
-      - name: Upload macOS app
-        uses: actions/upload-artifact@v4
-        with:
-          name: Dangerzone-${{ matrix.arch }}.app
-          path: "dist/Dangerzone.app"
-          if-no-files-found: error
-          compression-level: 0
   build-deb:
     needs:
       - build-container-image
@@ -237,7 +216,7 @@ jobs:
         if: matrix.distro == 'debian' && matrix.version == 'bookworm'
         uses: actions/upload-artifact@v4
         with:
-          name: dangerzone.deb
+          name: dangerzone-${{ matrix.distro }}-${{ matrix.version }}.deb
           path: "deb_dist/dangerzone_*_*.deb"
           if-no-files-found: error
           compression-level: 0
@@ -276,7 +255,7 @@ jobs:
       - name: Download Dangerzone .deb
         uses: actions/download-artifact@v4
         with:
-          name: dangerzone.deb
+          name: dangerzone-debian-bookworm.deb
           path: "deb_dist/"
 
       - name: Build end-user environment
@@ -339,14 +318,6 @@ jobs:
           ./dev_scripts/env.py --distro ${{ matrix.distro }} --version ${{ matrix.version }} \
               run --dev --no-gui ./dangerzone/install/linux/build-rpm.py
 
-      - name: Upload Dangerzone .rpm
-        uses: actions/upload-artifact@v4
-        with:
-          name: dangerzone-${{ matrix.distro }}-${{ matrix.version }}.rpm
-          path: "dist/dangerzone-*.x86_64.rpm"
-          if-no-files-found: error
-          compression-level: 0
-
       # Reclaim some space in this step, now that the dev environment is no
       # longer necessary. Previously, we encountered out-of-space issues while
       # running this CI job.