Merge pull request #497 from freedomofpress/ci-bookworm

Have CI run on bookworm & trigger on GitHub's merge queue

.github/workflows/ci.yml

@@ -1,12 +1,12 @@
 ---
 name: CI
 
-on: [push, pull_request]
+on: [merge_group, push, pull_request]
 
 jobs:
   checks:
     runs-on: ubuntu-latest
-    container: debian:bullseye
+    container: debian:bookworm
     steps:
       - name: Bootstrap Debian system package dependencies
         run: |
@@ -26,4 +26,4 @@ jobs:
       - name: Run tests except reprotest
         run: |
           . ./.venv/bin/activate
-          make test
+          make test

.github/workflows/reprotest.yml

@@ -2,6 +2,7 @@
 name: CI
 
 on:
+  merge_group:
   push:
   pull_request:
   schedule:
@@ -10,7 +11,7 @@ on:
 jobs:
   reprotest:
     runs-on: ubuntu-latest
-    container: debian:bullseye
+    container: debian:bookworm
     steps:
       - name: Bootstrap Debian system package dependencies
         run: |
@@ -30,4 +31,4 @@ jobs:
           # Necessary to run checks as non-root user, to avoid reproducibility issues
           adduser --system ci --ingroup root
           chown ci:root -R .
-          sudo -u ci bash -c "source .venv/bin/activate && pytest -vvs tests/test_reproducible_wheels.py"
+          sudo -u ci bash -c "source .venv/bin/activate && pytest -vvs tests/test_reproducible_wheels.py"

securedrop-client/sha256sums.txt

@@ -9,7 +9,7 @@ f61384bcc80318821d1116891a82bb0ff18a9a4035c7c4eff72aced45ab590b5  Mako-1.2.2-py3
 e61445980f0dcd584d728844d8ad516c9e460bd71f53c14c0269d73de6fba6be  MarkupSafe-2.0.1-cp311-cp311-linux_x86_64.whl
 9a055a175f351a559937fb80ebb2885d005283577a016c0139817e261fb759eb  MarkupSafe-2.0.1-cp39-cp39-linux_x86_64.whl
 594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a  MarkupSafe-2.0.1.tar.gz
-af3ec7384a7da692a0db1b807da2eb5bda1372a1eea2a8b26c2ff8ccc1bbf897  SQLAlchemy-1.3.3-cp311-cp311-linux_x86_64.whl
+6883fcbac625a58b913ad7c546008f83071eafae6767bb570b2f47872bc211d2  SQLAlchemy-1.3.3-cp311-cp311-linux_x86_64.whl
 86ed1e4985a9fd4f3c784da1fcefb89f4435c1c70815f43e5741c0c9f3c79be3  SQLAlchemy-1.3.3-cp39-cp39-linux_x86_64.whl
 91c54ca8345008fceaec987e10924bf07dcab36c442925357e5a467b36a38319  SQLAlchemy-1.3.3.tar.gz
 ad1e93816f37f8445bb12dfe412579d2237818c9bbf34054a06e00d5f430c700  alembic-1.0.2-py2.py3-none-any.whl

securedrop-client/sha256sums.txt.asc

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEETASaYTBMr1LMpavPW6rc/l76p9EFAmXLv1EACgkQW6rc/l76
-p9Hn3BAAvYIh1fKf4ereok/ZDEvO2Na+wF5O4LFmBIoAyOl44RBMH4cMPpES4v1g
-zRFMB0kETF/3drzNjSsdphvL45VMFZnXQMS5Ijrbl1Dx7Zh8H7YBXLW+2tgBHjZl
-okTbksUddOpefm9d0N6mR200b0SAzhyws2Hi4p8RA17rtegFiU/j3q0MxtmLUtbY
-qz75JeJMcNSGjpg90opPJTwU5qeh4Isu1Yc1EJb4Zcnz1O2gIgQ6UdFkcBTrOkUB
-++goEtpJ9PHNcJ7qaHjZdzXyosnHhZeLXWVTia4Sy32Dg2YDODuiMcyZhzCcuKGY
-DJTqqhXT0zg44YHCe07ANRC6GsSBkLpnv07Wq4V7XlJ6viyMz9bR6aKxAfYaFThm
-AIFilW7jkIxYzq58W6ENoIgG972WXfeYIIHw0NW2oxv4LOUa10C/TsdjejynexV2
-YnL5xKf1L2MXKAFhv2Zv6vq9gIoexNtp370nWkniqJZBrIs92O76CoJd4t3lD68d
-VLtCpXkhLMCKpheJoEwif12inNWwefNbbHmKoaCVcG0XLcH/f5J0c3YbSSDorQnJ
-RO9Qg0VWP/eVWL529UMxV8pXgRhHqlEJQVTwxvo/D3g8IIDmXoKEdQ3+28qRk8sz
-1yODTmEs4SBIETqc57vd+XWIQ93lmAFL0Uion/4w5bRW/8Y5eNc=
-=i2aB
+iQIzBAABCAAdFiEE2MtZ8F27ngU4xIGd8QX4EBsFJpsFAmYoKp8ACgkQ8QX4EBsF
+JptW2A//TQH1VTBa1ilpNXLUru0SfLoe2QQ9E7HL+cSR8oTs4LIpkn2YoxwQAKWl
+3uVGILwOV4Q5T96ASA1h11m1Eq1BtsLBdgI6Pu5HmBSWVx56/PDsr1sjZIlRM7dX
+btHiPpd9osE7lkklPFLV1qjlD7U92JI1cJkTI4V/T6fjFiP9JJ8dRxdDbkI/BalO
+3p1KRGX5z6FzQM6sayt/7Rloekxe/Jebu+Y+d010CfzL3vd1yPkuY3QDcySByAe9
+J/dz5WEPQItHD0ZbbLPIEw92sYKtp+9eu3aKpQ2MWQK3BQZ6eNYtVwj5BzKM1aRy
+2wAXaKS+ePpZqrGn7az7uMnEx1x+NfNDRu4W2FN0qK5q6RwSUZ7P+WJPehfwLtfX
+riwW7I8EdJ3xdWCpuCj3ThHWIvH7+ZRy2P3K9jjITzbq7Xef6WUBeQjaXxvHFdaT
+OKzYpPVFcZMN0Im0NJ3YGuZjHV45L0BLTRqB9xpomTQ6HeL9Yt/SCyLB9NbGir0k
+BaTSdXyYQU8WvpsxdzuHcXvkxz88Fj+OtqdGjmJnMvxaKcSwfysuohPqUQcvH1e7
+xq105ege4itCNkLpdFqnu6iWzzGJSsNSjc3IepjJmbPEpzEoN35bnkdtuvL/ql+O
+h6scW3I6PdfaUXIyw0UILt0yKEg48NTJ9BYqg+xuSiPd/tOh+4w=
+=muUv
 -----END PGP SIGNATURE-----

securedrop-proxy/sha256sums.txt

@@ -1,4 +1,4 @@
-9608c1b459ff310fe7fa78e8a9e12767a9a0ea9e3fa7cce116db58f95b61f56f  PyYAML-5.4.1-cp311-cp311-linux_x86_64.whl
+39d06e4b7eeb30adcdc091ac01a3124a8f74509104502a5fb4da4ffc05437182  PyYAML-5.4.1-cp311-cp311-linux_x86_64.whl
 f7190863a72d6eb89ed92e345e178a0803c439fd7126985b62c1c113cb01e534  PyYAML-5.4.1-cp39-cp39-linux_x86_64.whl
 607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e  PyYAML-5.4.1.tar.gz
 2dee87f82eab7a047280038bacb5bdbc4ee308ae39522ccd9da2ceefe7b6f84e  certifi-2021.5.30-py2.py3-none-any.whl

securedrop-proxy/sha256sums.txt.asc

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCAAdFiEE2MtZ8F27ngU4xIGd8QX4EBsFJpsFAmTH/XMACgkQ8QX4EBsF
-Jpsr2xAAqad4LobYdDhIj8flWrIQ+pS0D/59UvVZRsmnqBWaPAGvmAkFyfacmDyi
-sQ2lop0k24oiTdjqCgwtG1Pzf9JFOiusvBHTd+/pYD04TBmNZ5rJNoY0gxFtT6cX
-7EhFeJczSJTVaTurqqw9AuL+oHAkLgRKvbrUa9G6GN3HWv+vpZvaYq4hk8eaRIqT
-y+TZjgFRnn5ECDfGiN0Sp5oVnF/xGzTfEtqercPw1ZGHvm/zF0aC3swib/Y1JJBI
-ZYcW7dghDAbs29BMVP0fOnXDhi72OB7mmV7pKZhQ4bVDsJeiuQw7CYsB8xoX3Wnv
-vdewKTGo3vIaEx+ACLFJFrEao7oztuAov8mpyDtn1pQPJMvFyaezFrcX/8eV9bnd
-n65m32tYEf1wNvc57WHVtPwpvm4vv9GXrxvBJGPXiesLQqEb9Drx4KzFJEMcHyQB
-+6QOz6x+n621tXhsaNkr/uECfIEwGmitlcKzg0fsjDl9ebb8D4dVj6VvsLU0zP7h
-qOdjaJiUYALw7QJD4umXChT4XQJHFDh57NmyjCx/LyjuzQ638ieWvpKS0UsOcR1Q
-UkJMaO4EcDz8LrqFlfnG1AwYspiW1gx8Q67ZXT30h9Lmm0+Kg8qA/C9IKK/Rxund
-HUq0a20gqaiLQqWwfi7F7jiGn8h93lgsNNqDHNcPWAExTSH+1bM=
-=VXyG
+iQIzBAABCAAdFiEE2MtZ8F27ngU4xIGd8QX4EBsFJpsFAmYoKrQACgkQ8QX4EBsF
+Jpuw4w//Q2pkagdJ4liePzqcDpCOHnMWcCcIMUKq6cZkTRyWT63SbhxHQcsmtr78
+WDfHDEYf8D+tkBqASGCOwMH2B2Y+GIgkpb76AsVBCoZBUKNzlK73KFx7ge5+/8I5
+eI4JWTO72P8UfBAddPdPUq+75U2nhkMgsdPHSyiQMqgl1Y0YHtnLT8eOtDImgAjj
+T1GaXZaeB9+vHWxdLsuUCQBgNN++w+Z5XlzGC21sNR0EkExTRZzNb8TC2GxY9hXG
+kISQo5vySd6TZz+lU/6gl4Gg5Zz0C8PoiRc25V0TLml+Yfr/WtjZlAaKFnj0WocF
+rtYFeKn8C+CCeYhRIP/Qx7VkxSq2DKRczI3PcUusjk5OihlRId0Isf4cGC48OR/c
+PKMI4mKps8gTAAxbKMeMbS2jRhc7lBZ4SYOb53FvnF29ne6dMfmC01CfQHIWiXlz
+KDcy+uhhiqQc76s7nXdnz6LM96rS4Rn+oeRzAsOKpb+QNdeq0pyVeAGrJIk35xp8
+lORYxLpn+oH7BwCxG6unfjgS3t1UN6nqIXS+i/hS4HuKjo0bPVBL44zYjvHM7utc
+1LTdNVSiFUPn4Kl8vB4zGdJMfQ+EdL/aCKZuzdqysqqTDnOebUr2JKN3Hvy64XDB
+xWO+ZkfuC38oeIGwvd13udsHOKPBKFt7UiSUzYVZmORUUtMhH4Y=
+=3Wnb
 -----END PGP SIGNATURE-----