Merge pull request #24 from almet/release-0.7.0

freedomofpress · Jul 10, 2024 · 97aed85 · 97aed85
2 parents 359f5c2 + 45c8134
commit 97aed85
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 49 deletions.
diff --git a/.github/workflows/check-packages.yml b/.github/workflows/check-packages.yml
@@ -7,11 +7,11 @@ jobs:
   check-sigs:
     runs-on: ubuntu-latest
     container:
-      image: fedora:37
+      image: fedora:40
     steps:
       - name: Install RPM packaging dependencies
         run: yum -y update && yum -y install git git-lfs
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           lfs: true
       - name: Verify signatures on all RPMs
@@ -26,7 +26,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - version: "38"
           - version: "39"
           - version: "40"
     steps:
@@ -47,16 +46,6 @@ jobs:
           mkdir "./main/dist"
           mv ./yum/dangerzone/f${{ matrix.version }}/*.rpm ./main/dist/.
 
-          # Rename files to -1.rpm, as expected by the
-          # `./dev_scripts/env.py build` command
-          # 
-          # This can be removed once we get back to the usual `-1` patch level.
-          pushd ./main/dist/
-          for file in dangerzone-*-2.fc*.rpm; do
-            mv "$file" "${file//-2./-1.}"
-          done
-          popd
-
       - name: Build end-user environment
         working-directory: main
         run: |

diff --git a/dangerzone/f38/dangerzone-0.6.1-2.fc38.src.rpm b/dangerzone/f38/dangerzone-0.6.1-2.fc38.src.rpm
diff --git a/dangerzone/f38/dangerzone-0.6.1-2.fc38.x86_64.rpm b/dangerzone/f38/dangerzone-0.6.1-2.fc38.x86_64.rpm
diff --git a/dangerzone/f38/dangerzone-qubes-0.6.1-2.fc38.src.rpm b/dangerzone/f38/dangerzone-qubes-0.6.1-2.fc38.src.rpm
diff --git a/dangerzone/f38/dangerzone-qubes-0.6.1-2.fc38.x86_64.rpm b/dangerzone/f38/dangerzone-qubes-0.6.1-2.fc38.x86_64.rpm
diff --git a/dangerzone/f39/dangerzone-0.6.1-2.fc39.src.rpm b/dangerzone/f39/dangerzone-0.6.1-2.fc39.src.rpm
diff --git a/dangerzone/f39/dangerzone-0.6.1-2.fc39.x86_64.rpm b/dangerzone/f39/dangerzone-0.6.1-2.fc39.x86_64.rpm
diff --git a/dangerzone/f39/dangerzone-0.7.0-1.fc39.src.rpm b/dangerzone/f39/dangerzone-0.7.0-1.fc39.src.rpm
diff --git a/dangerzone/f39/dangerzone-0.7.0-1.fc39.x86_64.rpm b/dangerzone/f39/dangerzone-0.7.0-1.fc39.x86_64.rpm
diff --git a/dangerzone/f39/dangerzone-qubes-0.6.1-2.fc39.src.rpm b/dangerzone/f39/dangerzone-qubes-0.6.1-2.fc39.src.rpm
diff --git a/dangerzone/f39/dangerzone-qubes-0.6.1-2.fc39.x86_64.rpm b/dangerzone/f39/dangerzone-qubes-0.6.1-2.fc39.x86_64.rpm
diff --git a/dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.src.rpm b/dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.src.rpm
diff --git a/dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.x86_64.rpm b/dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.x86_64.rpm
diff --git a/dangerzone/f40/dangerzone-0.6.1-2.fc40.src.rpm b/dangerzone/f40/dangerzone-0.6.1-2.fc40.src.rpm
diff --git a/dangerzone/f40/dangerzone-0.6.1-2.fc40.x86_64.rpm b/dangerzone/f40/dangerzone-0.6.1-2.fc40.x86_64.rpm
diff --git a/dangerzone/f40/dangerzone-0.7.0-1.fc40.src.rpm b/dangerzone/f40/dangerzone-0.7.0-1.fc40.src.rpm
diff --git a/dangerzone/f40/dangerzone-0.7.0-1.fc40.x86_64.rpm b/dangerzone/f40/dangerzone-0.7.0-1.fc40.x86_64.rpm
diff --git a/dangerzone/f40/dangerzone-qubes-0.6.1-2.fc40.src.rpm b/dangerzone/f40/dangerzone-qubes-0.6.1-2.fc40.src.rpm
diff --git a/dangerzone/f40/dangerzone-qubes-0.6.1-2.fc40.x86_64.rpm b/dangerzone/f40/dangerzone-qubes-0.6.1-2.fc40.x86_64.rpm
diff --git a/dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.src.rpm b/dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.src.rpm
diff --git a/dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.x86_64.rpm b/dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.x86_64.rpm