gh-Mbed-TLS/TF-PSA-Crypto
Watch
1
0
Fork
You've already forked TF-PSA-Crypto
 0
Code Issues 167 Pull requests 92 Releases 5 Activity

Test release preparation #555

Open
gilles-peskine-arm wants to merge 11 commits from gilles-peskine-arm/prepare-release-test into development
pull from: gilles-peskine-arm/prepare-release-test
merge into: gh-Mbed-TLS:development
Conversation 4 Commits 11 Files changed 3 +177 -1
gilles-peskine-arm commented 2025-10-29 13:35:07 -05:00 (Migrated from github.com)

Addresses most of https://github.com/Mbed-TLS/mbedtls/issues/3255 . What is left is to arrange for the Groovy code to pick up the release artifacts created by the new all.sh component as Jenkins artifacts.

Addresses most of https://github.com/Mbed-TLS/mbedtls-framework/pull/231 by creating bump_version.sh in crypto. We might want to put this functionality into prepare_release.py, but I'm not fully convinced: there are significant differences between branches with respect to what version bumping does, so I think the code to do that belongs in each branch.

Fixes https://github.com/Mbed-TLS/mbedtls/issues/9521 by testing that builds done in different directories result in identical tarballs.

Needs preceding PR:

PR checklist

Addresses most of https://github.com/Mbed-TLS/mbedtls/issues/3255 . What is left is to arrange for the Groovy code to pick up the release artifacts created by the new `all.sh` component as Jenkins artifacts. Addresses most of https://github.com/Mbed-TLS/mbedtls-framework/pull/231 by creating `bump_version.sh` in crypto. We might want to put this functionality into `prepare_release.py`, but I'm not fully convinced: there are significant differences between branches with respect to what version bumping does, so I think the code to do that belongs in each branch. Fixes https://github.com/Mbed-TLS/mbedtls/issues/9521 by testing that builds done in different directories result in identical tarballs. Needs preceding PR: * [ ] https://github.com/Mbed-TLS/mbedtls-framework/pull/231 * [x] Not needed to pass the CI, but needed for `bump_version.sh` not to be incomplete: https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/554 * [x] The `bump_version.sh` commits are in https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/676 * [x]: needs Ubuntu 24.04 on the CI https://github.com/Mbed-TLS/mbedtls-test/pull/230 ## PR checklist - [x] **changelog** not required because: test only - [x] **framework PR** provided https://github.com/Mbed-TLS/mbedtls-framework/pull/231 - [ ] **mbedtls development PR** TODO - [ ] **mbedtls 4.1 PR** TODO - [x] **TF-PSA-Crypto development PR** https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/555 - [ ] **TF-PSA-Crypto 1.1 PR** TODO - [x] **mbedtls 3.6 PR** No, we'll keep the old process for the remaining life time of 3.6 - **tests** provided
gilles-peskine-arm (Migrated from github.com) reviewed 2025-10-29 13:42:42 -05:00
tests/scripts/components-release.sh
@ -0,0 +9,4 @@
#### Release preparation
################################################################
next_product_version () {
gilles-peskine-arm (Migrated from github.com) commented 2025-10-29 13:42:42 -05:00

I'm not sure if the auxiliary functions here should move to framework/scripts/all-helpers.sh. They're pretty specific to release preparation.

I'm not sure if the auxiliary functions here should move to `framework/scripts/all-helpers.sh`. They're pretty specific to release preparation.
gilles-peskine-arm (Migrated from github.com) reviewed 2025-10-29 13:44:45 -05:00
tests/scripts/components-release.sh
@ -0,0 +25,4 @@
EOF
}
git_clone_recursively () {
gilles-peskine-arm (Migrated from github.com) commented 2025-10-29 13:44:45 -05:00

I want to tidy up the handling of submodules (both cloning, and the dirty worktree check) before copying this to mbedtls. For crypto with just one submodule, it's ok. But for the multiple submodules of Mbed TLS, I'd like a loop. And if I write that loop I might as well use it here too.

I want to tidy up the handling of submodules (both cloning, and the dirty worktree check) before copying this to mbedtls. For crypto with just one submodule, it's ok. But for the multiple submodules of Mbed TLS, I'd like a loop. And if I write that loop I might as well use it here too.
minosgalanakis commented 2026-01-28 11:16:10 -06:00 (Migrated from github.com)

@gilles-peskine-arm would it be possible to split this pr and add the bump-version.sh to TF-PSA-Crypto separately? it can come in as a standalone script?

@gilles-peskine-arm would it be possible to split this pr and add the bump-version.sh to TF-PSA-Crypto separately? it can come in as a standalone script?
gilles-peskine-arm commented 2026-01-28 11:35:26 -06:00 (Migrated from github.com)

@minosgalanakis Done: https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/676

@minosgalanakis Done: https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/676
This pull request has changes conflicting with the target branch.
  • framework
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'gilles-peskine-arm/prepare-release-test:gilles-peskine-arm/prepare-release-test'
git switch 'gilles-peskine-arm/prepare-release-test'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'development'
git merge --no-ff 'gilles-peskine-arm/prepare-release-test'
git switch 'gilles-peskine-arm/prepare-release-test'
git rebase 'development'
git switch 'development'
git merge --ff-only 'gilles-peskine-arm/prepare-release-test'
git switch 'gilles-peskine-arm/prepare-release-test'
git rebase 'development'
git switch 'development'
git merge --no-ff 'gilles-peskine-arm/prepare-release-test'
git switch 'development'
git merge --squash 'gilles-peskine-arm/prepare-release-test'
git switch 'development'
git merge --ff-only 'gilles-peskine-arm/prepare-release-test'
git switch 'development'
git merge 'gilles-peskine-arm/prepare-release-test'
git push origin 'development'
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
api-break
This issue/PR breaks the API and must wait for a new major version

  
approved
Design and code approved - may be waiting for CI or backports

  
bug
Something isn't working

  
component-docs
Docs / website issues filed here for tracking

  
component-platform
Portability layer and build scripts

  
component-test
Test framework and CI scripts

  
dependencies
Pull requests that update a dependency file

  
deprecation
needs deprecation announcement

  
DO-NOT-MERGE

   
enhancement
New feature or request

  
good first issue
Good for newcomers

  
help wanted
This issue is not being actively worked on, but PRs welcome.

  
needs-adoption
stalled PR that someone should pick up and complete

  
needs-backports
Backports are missing or are pending review and approval.

  
needs-ci
Needs to pass CI tests

  
needs-design-approval
Needs design discussion / approval

  
needs-info
An issue or PR which needs further info from the reporter / author

  
needs-preceding-pr
Requires another PR to be merged first

  
needs-review
Every commit must be reviewed by at least two team members

  
needs-reviewer
This PR needs someone to pick it up for review

  
needs-work

   
priority-high
High priority - will be reviewed soon

  
priority-low
Low priority - this may not receive review soon

  
priority-medium
Medium priority - this can be reviewed as time permits

  
priority-scheduled
This PR is big - it will require time to be scheduled for review

  
priority-very-high
Highest priority - prioritise this over other review work

  
resolved-after-1.1
The issue is resolved in development, but still present in 1.1 LTS.

  
single-reviewer
This PR qualifies for having only one reviewer

  
size-l
Estimated task size: large (2w+)

  
size-m
Estimated task size: medium (~1w)

  
size-optimisation

   
size-s
Estimated task size: small (~2d)

  
size-xs
Estimated task size: extra small (a few hours at most)

No labels
api-break
approved
bug
component-docs
component-platform
component-test
dependencies
deprecation
DO-NOT-MERGE
enhancement
good first issue
help wanted
needs-adoption
needs-backports
needs-ci
needs-design-approval
needs-info
needs-preceding-pr
needs-review
needs-reviewer
needs-work
priority-high
priority-low
priority-medium
priority-scheduled
priority-very-high
resolved-after-1.1
single-reviewer
size-l
size-m
size-optimisation
size-s
size-xs
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
gh-Mbed-TLS/TF-PSA-Crypto!555
No description provided.