From 0adb5f20e0e2cea6b0329a6cf7ad3d9a3447c70b Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Tue, 23 Apr 2024 10:35:26 -0400 Subject: [PATCH 1/3] Have CI run on bookworm --- .github/workflows/ci.yml | 4 ++-- .github/workflows/reprotest.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e748fa..5e1b302 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: [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 \ No newline at end of file + make test diff --git a/.github/workflows/reprotest.yml b/.github/workflows/reprotest.yml index 0cbf967..85a1525 100644 --- a/.github/workflows/reprotest.yml +++ b/.github/workflows/reprotest.yml @@ -10,7 +10,7 @@ on: jobs: reprotest: runs-on: ubuntu-latest - container: debian:bullseye + container: debian:bookworm steps: - name: Bootstrap Debian system package dependencies run: | @@ -30,4 +30,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" \ No newline at end of file + sudo -u ci bash -c "source .venv/bin/activate && pytest -vvs tests/test_reproducible_wheels.py" From 6111e911e16fc6ffa1b130502edb3a769eedd1ba Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Tue, 23 Apr 2024 10:35:54 -0400 Subject: [PATCH 2/3] Trigger CI on GitHub's merge queue This doesn't enable the merge queue, but is a prerequisite. See for details. --- .github/workflows/ci.yml | 2 +- .github/workflows/reprotest.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e1b302..2ff027e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ --- name: CI -on: [push, pull_request] +on: [merge_group, push, pull_request] jobs: checks: diff --git a/.github/workflows/reprotest.yml b/.github/workflows/reprotest.yml index 85a1525..3263e53 100644 --- a/.github/workflows/reprotest.yml +++ b/.github/workflows/reprotest.yml @@ -2,6 +2,7 @@ name: CI on: + merge_group: push: pull_request: schedule: From a6007aa932c9cc9479744026a248661cef32e654 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Tue, 23 Apr 2024 11:41:42 -0400 Subject: [PATCH 3/3] Rebuild compiled wheels on bookworm Something has likely changed in upstream CPython that changed the line some code is defined, causing the debugging information to change accordingly. Rebuild the wheels to update the debug information for the new source locations; this can be verified with diffoscope, e.g. . --- securedrop-client/sha256sums.txt | 2 +- securedrop-client/sha256sums.txt.asc | 26 +++++++++---------- ...Alchemy-1.3.3-cp311-cp311-linux_x86_64.whl | 4 +-- securedrop-proxy/sha256sums.txt | 2 +- securedrop-proxy/sha256sums.txt.asc | 26 +++++++++---------- .../PyYAML-5.4.1-cp311-cp311-linux_x86_64.whl | 2 +- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/securedrop-client/sha256sums.txt b/securedrop-client/sha256sums.txt index 04b0ceb..b88edb4 100644 --- a/securedrop-client/sha256sums.txt +++ b/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 diff --git a/securedrop-client/sha256sums.txt.asc b/securedrop-client/sha256sums.txt.asc index fd7fbbc..c6d35c7 100644 --- a/securedrop-client/sha256sums.txt.asc +++ b/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----- diff --git a/securedrop-client/wheels/SQLAlchemy-1.3.3-cp311-cp311-linux_x86_64.whl b/securedrop-client/wheels/SQLAlchemy-1.3.3-cp311-cp311-linux_x86_64.whl index a7d185c..6bbb3b9 100644 --- a/securedrop-client/wheels/SQLAlchemy-1.3.3-cp311-cp311-linux_x86_64.whl +++ b/securedrop-client/wheels/SQLAlchemy-1.3.3-cp311-cp311-linux_x86_64.whl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af3ec7384a7da692a0db1b807da2eb5bda1372a1eea2a8b26c2ff8ccc1bbf897 -size 1172849 +oid sha256:6883fcbac625a58b913ad7c546008f83071eafae6767bb570b2f47872bc211d2 +size 1172850 diff --git a/securedrop-proxy/sha256sums.txt b/securedrop-proxy/sha256sums.txt index 8d1ebf4..1726565 100644 --- a/securedrop-proxy/sha256sums.txt +++ b/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 diff --git a/securedrop-proxy/sha256sums.txt.asc b/securedrop-proxy/sha256sums.txt.asc index 1640208..5d30551 100644 --- a/securedrop-proxy/sha256sums.txt.asc +++ b/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----- diff --git a/securedrop-proxy/wheels/PyYAML-5.4.1-cp311-cp311-linux_x86_64.whl b/securedrop-proxy/wheels/PyYAML-5.4.1-cp311-cp311-linux_x86_64.whl index debb00c..b574b63 100644 --- a/securedrop-proxy/wheels/PyYAML-5.4.1-cp311-cp311-linux_x86_64.whl +++ b/securedrop-proxy/wheels/PyYAML-5.4.1-cp311-cp311-linux_x86_64.whl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9608c1b459ff310fe7fa78e8a9e12767a9a0ea9e3fa7cce116db58f95b61f56f +oid sha256:39d06e4b7eeb30adcdc091ac01a3124a8f74509104502a5fb4da4ffc05437182 size 515932