Skip to content

Allow underscores in devkit distribution name when publishing #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

sxa
Copy link
Member

@sxa sxa commented Mar 28, 2025

Fedora riscv64 devkit has Fedora_28 in the name which is blocked by the devkit publish tool's regex:

+ JAVA_HOME=/usr/lib/jvm/temurin-21-jdk-arm64 bash ./sbin/PublishDevKit.sh
ERROR: devkit file does not match required regex pattern: devkit-gcc-14.2.0-Fedora_28-b00-riscv64-linux-gnu.tar.xz
ERROR: devkit file does not match required regex pattern: devkit-gcc-14.2.0-Fedora_28-b00-riscv64-linux-gnu.tar.xz.sha256.txt
ERROR: devkit file does not match required regex pattern: devkit-gcc-14.2.0-Fedora_28-b00-riscv64-linux-gnu.tar.xz.sig
ERROR: Some devkit filenames are not valid...

Related slack thread: https://adoptium.slack.com/archives/C09NW3L2J/p1743177415374159

Signed-off-by: Stewart X Addison <[email protected]>
@sxa
Copy link
Member Author

sxa commented Mar 30, 2025

Tested at https://ci.adoptium.net/job/build-scripts/job/release/job/publish_devkit_tool/123/ (dry-run) and https://ci.adoptium.net/job/build-scripts/job/release/job/publish_devkit_tool/124 (Publish) and those jobs have passed and the devkit has appeared at https://github.com/adoptium/devkit-binaries/releases/tag/gcc-14.2.0-Fedora_28-b00

When this is merged the changes to to use this branch in the publish_devkit_tool job should be reverted.

@sxa sxa marked this pull request as ready for review March 30, 2025 08:28
@sxa sxa requested a review from andrew-m-leonard March 30, 2025 08:28
@judovana
Copy link

Just question. In case of if [[ $file =~ $regex ]]; does "." need escaping when in [] ?

@judovana
Copy link

Afaik not, so the regex="^devkit-([[:alnum:]]+)-([[:digit:].]+)-([[:alnum:]._]+)-([[:alnum:]]+)-([[:alnum:]_]+)(-linux-gnu)\.(tar\.xz|tar\.xz\.sha256\.txt|tar\.xz\.sig)$"; would be more correct. But I can not swear. Have not found a explicit documentation to it, and experiemtnets suggests it do not meter.

`

Copy link
Contributor

@andrew-m-leonard andrew-m-leonard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@sxa
Copy link
Member Author

sxa commented Mar 31, 2025

Just question. In case of if [[ $file =~ $regex ]]; does "." need escaping when in [] ?

Hmmm might be worth looking into that separately. I'm all for keeping it simpler if possible, but for the purposes of this PR I think I'll leave the existing bits as-is :-) I don't tend to use these bash constructs so hadn't thought about it!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

None yet

3 participants