Skip to content

[pull] main from actions:main #261

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.

Sign up for GitHub

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

Merged
pull merged 1 commit into from
May 21, 2026
Merged

[pull] main from actions:main #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions images/ubuntu/scripts/build/install-kubernetes-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,12 @@ apt-get install kubectl
rm -f /etc/apt/sources.list.d/kubernetes.list

# Install Helm
curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash

if is_ubuntu26; then
helm_installer_script="get-helm-4"
else
helm_installer_script="get-helm-3"
fi
curl -fsSL "https://raw.githubusercontent.com/helm/helm/master/scripts/${helm_installer_script}" | bash

# Download and install minikube
minikube_version="latest"
Expand Down
38 changes: 27 additions & 11 deletions images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ $languageAndRuntime.AddToolVersionsListInline("Clang-tidy", $(Get-ClangTidyVersi
$languageAndRuntime.AddToolVersion("Dash", $(Get-DashVersion))
$languageAndRuntime.AddToolVersionsListInline("GNU C++", $(Get-CPPVersions), "^\d+")
$languageAndRuntime.AddToolVersionsListInline("GNU Fortran", $(Get-FortranVersions), "^\d+")
if (Test-IsX64) {
if ((Test-IsUbuntu22-X64) -or (Test-IsUbuntu24-X64)) {
$languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion))
}
$languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion))
Expand All @@ -66,7 +66,7 @@ $packageManagement = $installedSoftware.AddHeader("Package Management")
$packageManagement.AddToolVersion("cpan", $(Get-CpanVersion))
$packageManagement.AddToolVersion("Helm", $(Get-HelmVersion))
$packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion))
if (Test-IsX64) {
if ((Test-IsUbuntu22-X64) -or (Test-IsUbuntu24-X64)) {
$packageManagement.AddToolVersion("Miniconda", $(Get-MinicondaVersion))
}
$packageManagement.AddToolVersion("Npm", $(Get-NpmVersion))
Expand All @@ -91,7 +91,9 @@ to accomplish this.
$projectManagement = $installedSoftware.AddHeader("Project Management")
$projectManagement.AddToolVersion("Ant", $(Get-AntVersion))
$projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion))
$projectManagement.AddToolVersion("Lerna", $(Get-LernaVersion))
if ((Test-IsUbuntu22) -or (Test-IsUbuntu24)) {
$projectManagement.AddToolVersion("Lerna", $(Get-LernaVersion))
}
$projectManagement.AddToolVersion("Maven", $(Get-MavenVersion))
if (Test-IsUbuntu22-X64) {
$projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion))
Expand Down Expand Up @@ -119,11 +121,15 @@ $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version))
$tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion))
$tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion))
$tools.AddToolVersion("Docker Server", $(Get-DockerServerVersion))
$tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion))
if ((Test-IsUbuntu22) -or (Test-IsUbuntu24)) {
$tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion))
}
$tools.AddToolVersion("Git", $(Get-GitVersion))
$tools.AddToolVersion("Git LFS", $(Get-GitLFSVersion))
$tools.AddToolVersion("Git-ftp", $(Get-GitFTPVersion))
$tools.AddToolVersion("Haveged", $(Get-HavegedVersion))
if ((Test-IsUbuntu22) -or (Test-IsUbuntu24)) {
$tools.AddToolVersion("Haveged", $(Get-HavegedVersion))
}
if (Test-IsUbuntu22-X64) {
$tools.AddToolVersion("Heroku", $(Get-HerokuVersion))
}
Expand All @@ -134,22 +140,32 @@ $tools.AddToolVersion("Kustomize", $(Get-KustomizeVersion))
if (Test-IsUbuntu22-X64) {
$tools.AddToolVersion("Leiningen", $(Get-LeiningenVersion))
}
$tools.AddToolVersion("MediaInfo", $(Get-MediainfoVersion))
$tools.AddToolVersion("Mercurial", $(Get-HGVersion))
if ((Test-IsUbuntu22) -or (Test-IsUbuntu24)) {
$tools.AddToolVersion("MediaInfo", $(Get-MediainfoVersion))
$tools.AddToolVersion("Mercurial", $(Get-HGVersion))
}
$tools.AddToolVersion("Minikube", $(Get-MinikubeVersion))
$tools.AddToolVersion("n", $(Get-NVersion))
$tools.AddToolVersion("Newman", $(Get-NewmanVersion))
if ((Test-IsUbuntu22) -or (Test-IsUbuntu24)) {
$tools.AddToolVersion("Newman", $(Get-NewmanVersion))
}
$tools.AddToolVersion("nvm", $(Get-NvmVersion))
$tools.AddToolVersion("OpenSSL", $(Get-OpensslVersion))
$tools.AddToolVersion("Packer", $(Get-PackerVersion))
$tools.AddToolVersion("Parcel", $(Get-ParcelVersion))
if ((Test-IsUbuntu22) -or (Test-IsUbuntu24)) {
$tools.AddToolVersion("Parcel", $(Get-ParcelVersion))
}
$tools.AddToolVersion("Podman", $(Get-PodManVersion))
$tools.AddToolVersion("Pulumi", $(Get-PulumiVersion))
if ((Test-IsUbuntu22) -or (Test-IsUbuntu24)) {
$tools.AddToolVersion("Pulumi", $(Get-PulumiVersion))
}
if (Test-IsUbuntu22-X64) {
$tools.AddToolVersion("R", $(Get-RVersion))
}
$tools.AddToolVersion("Skopeo", $(Get-SkopeoVersion))
$tools.AddToolVersion("Sphinx Open Source Search Server", $(Get-SphinxVersion))
if ((Test-IsUbuntu22) -or (Test-IsUbuntu24)) {
$tools.AddToolVersion("Sphinx Open Source Search Server", $(Get-SphinxVersion))
}
if (Test-IsUbuntu22) {
$tools.AddToolVersion("SVN", $(Get-SVNVersion))
$tools.AddToolVersion("Terraform", $(Get-TerraformVersion))
Expand Down
6 changes: 3 additions & 3 deletions images/ubuntu/scripts/tests/Tools.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ Describe "Homebrew" {
}
}

Describe "Julia" -Skip:(Test-IsArm64) {
Describe "Julia" -Skip:(-not ((Test-IsUbuntu22-X64) -or (Test-IsUbuntu24-X64))) {
It "julia" {
"julia --version" | Should -ReturnZeroExitCode
}
Expand Down Expand Up @@ -291,7 +291,7 @@ Describe "Leiningen" -Skip:((-not (Test-IsUbuntu22-X64))) {
}
}

Describe "Conda" -Skip:(Test-IsArm64) {
Describe "Conda" -Skip:(-not ((Test-IsUbuntu22-X64) -or (Test-IsUbuntu24-X64))) {
It "conda" {
"conda --version" | Should -ReturnZeroExitCode
}
Expand All @@ -303,7 +303,7 @@ Describe "Packer" {
}
}

Describe "Pulumi" {
Describe "Pulumi" -Skip:(Test-IsUbuntu26) {
It "pulumi" {
"pulumi version" | Should -ReturnZeroExitCode
}
Expand Down
1 change: 0 additions & 1 deletion images/ubuntu/templates/build.ubuntu-26_04-arm64.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ provisioner "shell" {
"${path.root}/../scripts/build/install-nodejs.sh",
"${path.root}/../scripts/build/install-bazel.sh",
"${path.root}/../scripts/build/install-php.sh",
"${path.root}/../scripts/build/install-pulumi.sh",
"${path.root}/../scripts/build/install-ruby.sh",
"${path.root}/../scripts/build/install-rust.sh",
"${path.root}/../scripts/build/install-selenium.sh",
Expand Down
3 changes: 0 additions & 3 deletions images/ubuntu/templates/build.ubuntu-26_04.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ provisioner "shell" {
"${path.root}/../scripts/build/install-haskell.sh",
"${path.root}/../scripts/build/install-java-tools.sh",
"${path.root}/../scripts/build/install-kubernetes-tools.sh",
"${path.root}/../scripts/build/install-miniconda.sh",
"${path.root}/../scripts/build/install-kotlin.sh",
"${path.root}/../scripts/build/install-mysql.sh",
"${path.root}/../scripts/build/install-nginx.sh",
Expand All @@ -133,10 +132,8 @@ provisioner "shell" {
"${path.root}/../scripts/build/install-bazel.sh",
"${path.root}/../scripts/build/install-php.sh",
"${path.root}/../scripts/build/install-postgresql.sh",
"${path.root}/../scripts/build/install-pulumi.sh",
"${path.root}/../scripts/build/install-ruby.sh",
"${path.root}/../scripts/build/install-rust.sh",
"${path.root}/../scripts/build/install-julia.sh",
"${path.root}/../scripts/build/install-selenium.sh",
"${path.root}/../scripts/build/install-packer.sh",
"${path.root}/../scripts/build/install-vcpkg.sh",
Expand Down
41 changes: 2 additions & 39 deletions images/ubuntu/toolsets/toolset-2604-arm64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
}
],
"java": {
"default": "21",
"default": "25",
"versions": [ "11", "17", "21", "25" ],
"maven": "3.9.15"
},
Expand Down Expand Up @@ -123,7 +123,6 @@
"libgbm-dev",
"libsqlite3-dev",
"locales",
"mercurial",
"openssh-client",
"7zip-rar",
"pkg-config",
Expand All @@ -150,10 +149,8 @@
"findutils",
"flex",
"ftp",
"haveged",
"lz4",
"m4",
"mediainfo",
"netcat",
"net-tools",
"7zip",
Expand All @@ -163,7 +160,6 @@
"pollinate",
"rsync",
"shellcheck",
"sphinxsearch",
"sqlite3",
"ssh",
"sshpass",
Expand Down Expand Up @@ -200,7 +196,7 @@
},
{
"plugin": "compose",
"version": "2.40.3",
"version": "5.1.3",
"asset": "linux-aarch64"
}
]
Expand Down Expand Up @@ -253,7 +249,6 @@
]
},
"rubygems": [
{"name": "fastlane"}
],
"selenium": {
"version": "4"
Expand All @@ -262,42 +257,10 @@
"default": "24"
},
"node_modules": [
{
"name": "grunt",
"command": "grunt"
},
{
"name": "gulp",
"command": "gulp"
},
{
"name": "n",
"command": "n"
},
{
"name": "parcel",
"command": "parcel"
},
{
"name": "typescript",
"command": "tsc"
},
{
"name": "newman",
"command": "newman"
},
{
"name": "webpack",
"command": "webpack"
},
{
"name": "webpack-cli",
"command": "webpack-cli"
},
{
"name": "lerna",
"command": "lerna"
},
{
"name": "yarn",
"command": "yarn"
Expand Down
41 changes: 2 additions & 39 deletions images/ubuntu/toolsets/toolset-2604.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}
],
"java": {
"default": "21",
"default": "25",
"versions": [ "11", "17", "21", "25" ],
"maven": "3.9.15"
},
Expand Down Expand Up @@ -126,7 +126,6 @@
"libssl-dev",
"libsqlite3-dev",
"locales",
"mercurial",
"openssh-client",
"7zip-rar",
"pkg-config",
Expand All @@ -153,10 +152,8 @@
"findutils",
"flex",
"ftp",
"haveged",
"lz4",
"m4",
"mediainfo",
"netcat",
"net-tools",
"7zip",
Expand All @@ -166,7 +163,6 @@
"pollinate",
"rsync",
"shellcheck",
"sphinxsearch",
"sqlite3",
"ssh",
"sshpass",
Expand Down Expand Up @@ -203,7 +199,7 @@
},
{
"plugin": "compose",
"version": "2.40.3",
"version": "5.1.3",
"asset": "linux-x86_64"
}
]
Expand Down Expand Up @@ -256,7 +252,6 @@
]
},
"rubygems": [
{"name": "fastlane"}
],
"selenium": {
"version": "4"
Expand All @@ -265,42 +260,10 @@
"default": "24"
},
"node_modules": [
{
"name": "grunt",
"command": "grunt"
},
{
"name": "gulp",
"command": "gulp"
},
{
"name": "n",
"command": "n"
},
{
"name": "parcel",
"command": "parcel"
},
{
"name": "typescript",
"command": "tsc"
},
{
"name": "newman",
"command": "newman"
},
{
"name": "webpack",
"command": "webpack"
},
{
"name": "webpack-cli",
"command": "webpack-cli"
},
{
"name": "lerna",
"command": "lerna"
},
{
"name": "yarn",
"command": "yarn"
Expand Down
Loading