From 07aaef683979f19842f0f34efe6a721f73f827c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Thu, 17 Oct 2024 17:49:47 +0200 Subject: [PATCH 1/5] Update RELEASE.md to upload container.tar.gz for both i686 and arm64 architectures. --- RELEASE.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 516952c..be5dc98 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -397,12 +397,14 @@ or create your own locally with: cd dangerzone ``` -Build the latest container: +Build the latest container, on both architectures: ```sh python3 ./install/common/build-image.py ``` +Rename the container images to `dangerzone.i686.tar.gz` and `dangerzone.arm64.tar.gz`. + Create a .rpm: ```sh @@ -449,9 +451,9 @@ To publish the release: * Copy the release notes text from the template at [`docs/templates/release-notes`](https://github.com/freedomofpress/dangerzone/tree/main/docs/templates/) * You can use `./dev_scripts/upload-asset.py`, if you want to upload an asset using an access token. -- [ ] Upload the `container.tar.gz` i686 image that was created in the previous step +- [ ] Upload the `container.i686.tar.gz` and `container.arm64.tar.gz` images that were created in the previous step - **Important:** Make sure that it's the same container image as the ones that + **Important:** Make sure that it's the same container images as the ones that are shipped in other platforms (see our [Pre-release](#Pre-release) section) - [ ] Upload the detached signatures (.asc) and checksum file. From 180de719e479850b5c61546a20a38c0d0b9e9a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Thu, 17 Oct 2024 19:40:32 +0200 Subject: [PATCH 2/5] fixup! Update RELEASE.md to upload container.tar.gz for both i686 and arm64 architectures. --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index be5dc98..6649bd9 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -397,7 +397,7 @@ or create your own locally with: cd dangerzone ``` -Build the latest container, on both architectures: +Build the latest container: ```sh python3 ./install/common/build-image.py From 965a5299d1e8aa1d18a297733de0066c6dcb47f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Thu, 17 Oct 2024 19:40:32 +0200 Subject: [PATCH 3/5] fixup! Update RELEASE.md to upload container.tar.gz for both i686 and arm64 architectures. --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 6649bd9..a2a8055 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -403,7 +403,7 @@ Build the latest container: python3 ./install/common/build-image.py ``` -Rename the container images to `dangerzone.i686.tar.gz` and `dangerzone.arm64.tar.gz`. +Copy the container image to the assets folder on `dangerzone-$VERSION-i686.tar.gz`. Create a .rpm: From d172d4ca5117690179b39a53df8dee24981a983f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Thu, 17 Oct 2024 19:40:32 +0200 Subject: [PATCH 4/5] fixup! Update RELEASE.md to upload container.tar.gz for both i686 and arm64 architectures. --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index a2a8055..0ff5333 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -451,7 +451,7 @@ To publish the release: * Copy the release notes text from the template at [`docs/templates/release-notes`](https://github.com/freedomofpress/dangerzone/tree/main/docs/templates/) * You can use `./dev_scripts/upload-asset.py`, if you want to upload an asset using an access token. -- [ ] Upload the `container.i686.tar.gz` and `container.arm64.tar.gz` images that were created in the previous step +- [ ] Upload the `container-$VERSION-i686.tar.gz` and `container-$VERSION-arm64.tar.gz` images that were created in the previous step **Important:** Make sure that it's the same container images as the ones that are shipped in other platforms (see our [Pre-release](#Pre-release) section) From 09308482709a57027a0cf73f1eb056d994192ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Thu, 17 Oct 2024 19:42:18 +0200 Subject: [PATCH 5/5] !fixup: put on the mac section, and update the sign-assets.py script --- RELEASE.md | 4 ++++ dev_scripts/sign-assets.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 0ff5333..9a7694c 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -285,6 +285,10 @@ Once we are confident that the release will be out shortly, and doesn't need any * You can verify the correct Python version is used with `poetry debug info` - [ ] Verify and checkout the git tag for this release - [ ] Run `poetry install --sync` +- [ ] On the silicon mac, build the container image: + ``` + python3 ./install/common/build-image.py + ```, and copy the `share/container.tar.gz` to the assets folder on `dangerzone-$VERSION-arm64.tar.gz`, along with the `share/image-id.txt` file. - [ ] Run `poetry run ./install/macos/build-app.py`; this will make `dist/Dangerzone.app` - [ ] Make sure that the build application works with the containerd graph driver (see [#933](https://github.com/freedomofpress/dangerzone/issues/933)) diff --git a/dev_scripts/sign-assets.py b/dev_scripts/sign-assets.py index 311203c..ab33e6b 100755 --- a/dev_scripts/sign-assets.py +++ b/dev_scripts/sign-assets.py @@ -11,7 +11,8 @@ log = logging.getLogger(__name__) DZ_ASSETS = [ - "container.tar.gz", + "container-{version}-i686.tar.gz", + "container-{version}-arm64.tar.gz", "Dangerzone-{version}.msi", "Dangerzone-{version}-arm64.dmg", "Dangerzone-{version}-i686.dmg",