This is an automated email from the ASF dual-hosted git repository. sciabarracom pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openserverless.git
commit 8e5cb6568d1c69d7c407f6adac8a08a2f00ff52a Author: Michele Sciabarra <[email protected]> AuthorDate: Thu Sep 10 15:36:10 2026 +0200 build-and-test-windows.ps1 working with docker installer --- Taskfile.yml | 2 +- build-and-test-windows.ps1 | 14 ++++++++------ releasing.py | 8 ++++++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index 124feef..7470c5a 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -315,7 +315,7 @@ tasks: openserverless - gpg --armor --detach-sign --local-user {{.KEY}} ../openserverless-{{.VER}}-src.tar.gz - cd .. && shasum -a 512 openserverless-{{.VER}}-src.tar.gz >openserverless-{{.VER}}-src.tar.gz.sha512 - - uv run releasing.py {{.VER}} >../../{{.VER}}.txt + - pyhon3 releasing.py {{.VER}} >../../{{.VER}}.txt - echo 'Next steps are svn push, git push --tags and send email' diff --git a/build-and-test-windows.ps1 b/build-and-test-windows.ps1 index cedce61..7e0a484 100755 --- a/build-and-test-windows.ps1 +++ b/build-and-test-windows.ps1 @@ -27,8 +27,8 @@ $ErrorActionPreference = "Stop" # Image to install from, and the name the local distribution is registered under. -# Keeping them distinct means an already installed 'Ubuntu' distro is left alone. -$BaseDistro = "Ubuntu" +# Keeping them distinct means an already installed 'Ubuntu-24.04' distro is left alone. +$BaseDistro = "Ubuntu-24.04" $Distro = "openserverless" $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path @@ -112,7 +112,7 @@ if ($LASTEXITCODE -ne 0) { Write-Host "Initializing $Distro as root (removing k3s, docker, creating user '$WslUser')" # On WSL there is no host user mapped in, so we create the build user ourselves. # We do it by running provisioning commands directly as root (wsl -u root), no -# boot command. The script is idempotent: removes k3s, ensures docker, and +# boot command. The script is idempotent: removes k3s, installs docker, and # creates '$WslUser' with docker + passwordless sudo. $initScript = @" set -e @@ -122,8 +122,8 @@ if [ -x /usr/local/bin/k3s-killall.sh ]; then /usr/local/bin/k3s-killall.sh; fi if [ -x /usr/local/bin/k3s-uninstall.sh ]; then /usr/local/bin/k3s-uninstall.sh; fi if [ -x /usr/local/bin/k3s-agent-uninstall.sh ]; then /usr/local/bin/k3s-agent-uninstall.sh; fi -# Ensure docker is installed. -command -v docker >/dev/null 2>&1 || curl -sL get.docker.com | sed -e 's/sleep 20/sleep 1/g' | sh +# Install docker. +curl -sL get.docker.com | sed -e 's/sleep 20/sleep 1/g' | sh # Create the build user if it does not already exist (idempotent). if ! id -u '$WslUser' >/dev/null 2>&1; then @@ -190,8 +190,10 @@ Write-Host "Running build-and-test-ubuntu.sh in $Distro as '$WslUser'" # Run the build/test script as ops from the source directory. ops was created # with the mount's owning uid/gid, so it can write the build output in place; # it has docker + passwordless sudo, so no newgrp/usermod is needed in-script. +# PATH is set explicitly to the distro's own directories, dropping the Windows +# PATH that WSL otherwise appends. $wslScriptDir = (wsl.exe -d $Distro wslpath -a ($ScriptDir -replace '\\', '/')).Trim() -wsl.exe -d $Distro --cd "$wslScriptDir" -u $WslUser -- bash -lc "./build-and-test-ubuntu.sh" +wsl.exe -d $Distro --cd "$wslScriptDir" -u $WslUser -- bash -lc 'export PATH="$HOME/.local/bin:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin"; ./build-and-test-ubuntu.sh' if ($LASTEXITCODE -ne 0) { Write-Error "build-and-test-ubuntu.sh failed with exit code $LASTEXITCODE" exit $LASTEXITCODE diff --git a/releasing.py b/releasing.py index 365ac59..249725b 100755 --- a/releasing.py +++ b/releasing.py @@ -54,6 +54,8 @@ VERSION_RE = re.compile( r"(?:-(?:RC|rc)(?P<rc>\d+))?$" ) +VERIFY_URL = "https://github.com/apache/openserverless/blob/0.9.0/VERIFY.md"; + DISCLAIMER = """\ Apache OpenServerless is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required @@ -175,7 +177,8 @@ class Release: "The KEYS file is available at:\n\n%s" % self.keys_url, "Please download, verify, and test the release candidate.", "For detailed step-by-step instructions on how to verify this\n" - "release, please see the file VERIFY.md within the source archive.", + "release, please see the file VERIFY.md within the source\n" + "archive, or check:\n\n%s" % VERIFY_URL, "The vote will run for a minimum of %d hours and close no earlier\n" "than:\n\n%s" % (self.hours, self.deadline.strftime("%Y-%m-%d %H:%M UTC")), @@ -207,7 +210,8 @@ class Release: "The KEYS file used to sign the artifacts is available at:\n\n%s" % self.keys_url, "For instructions on how to verify the release, please see the\n" - "file VERIFY.md within the source archive.", + "file VERIFY.md within the source archive, or check:\n\n%s" + % VERIFY_URL, ] if self.incubating: paragraphs.append(DISCLAIMER)
