This is an automated email from the ASF dual-hosted git repository.
terrymanu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 42834fc699d Update PowerShell and Rancher Desktop related CI config
and doc (#38922)
42834fc699d is described below
commit 42834fc699da9fc40bf438f6b246bbf764686273
Author: Hengqian Ling <[email protected]>
AuthorDate: Fri Jun 26 22:44:28 2026 +0800
Update PowerShell and Rancher Desktop related CI config and doc (#38922)
---
.github/workflows/graalvm.yml | 4 +---
.github/workflows/nightly-ci.yml | 4 +---
.../graalvm-native-image/development/_index.cn.md | 5 ++---
.../graalvm-native-image/development/_index.en.md | 5 ++---
.../shardingsphere-proxy/startup/graalvm-native-image.cn.md | 3 +--
.../shardingsphere-proxy/startup/graalvm-native-image.en.md | 3 +--
test/native/src/test/resources/test-native/ps1/config-rdctl.ps1 | 2 +-
test/native/src/test/resources/testcontainers.properties | 1 -
8 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/graalvm.yml b/.github/workflows/graalvm.yml
index f12f77bc3b1..b2c6e7ae20d 100644
--- a/.github/workflows/graalvm.yml
+++ b/.github/workflows/graalvm.yml
@@ -58,9 +58,7 @@ jobs:
run: ./test/native/src/test/resources/test-native/sh/free-disk-space.sh
- name: Setup Rancher Desktop without GUI on Windows Server
if: matrix.os == 'windows-latest'
- run: |
- ./test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
- "PATH=$env:PATH" >> $env:GITHUB_ENV
+ run: ./test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
- uses: ./.github/workflows/resources/actions/setup-build-environment
with:
java-version: ${{ matrix.java-version }}
diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
index b5fda17ff16..09f92c46933 100644
--- a/.github/workflows/nightly-ci.yml
+++ b/.github/workflows/nightly-ci.yml
@@ -81,9 +81,7 @@ jobs:
run: ./test/native/src/test/resources/test-native/sh/free-disk-space.sh
- name: Setup Rancher Desktop without GUI on Windows Server
if: matrix.os == 'windows-latest'
- run: |
- ./test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
- "PATH=$env:PATH" >> $env:GITHUB_ENV
+ run: ./test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
- uses: ./.github/workflows/resources/actions/setup-build-environment
with:
java-version: '25.0.2'
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.cn.md
index 4c930025001..50e73705edb 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.cn.md
@@ -93,7 +93,6 @@ sudo systemctl restart docker.service
```shell
winget install --id version-fox.vfox --source winget --exact
if (-not (Test-Path -Path $PROFILE)) { New-Item -Type File -Path $PROFILE
-Force }; Add-Content -Path $PROFILE -Value 'Invoke-Expression "$(vfox activate
pwsh)"'
-# 此时需要打开新的 Powershell 7 终端
vfox add java
vfox install [email protected]
vfox use --global [email protected]
@@ -121,12 +120,12 @@ wsl --install
```shell
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
-# 打开新的 PowerShell 7 终端
rdctl start --application.start-in-background --container-engine.name=moby
--kubernetes.enabled=false
@'
{
"min-api-version": "1.41",
+ "seccomp-profile": "/etc/rancher-desktop/seccomp.json",
"features": {
"containerd-snapshotter": true
},
@@ -150,12 +149,12 @@ rdctl start --application.start-in-background
--container-engine.name=moby --kub
```shell
iex "& { $(irm
https://raw.githubusercontent.com/microsoft/Windows-Containers/refs/heads/Main/helpful_tools/Install-DockerCE/uninstall-docker-ce.ps1)
} -Force"
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
-# 打开新的 PowerShell 7 终端
rdctl start --application.start-in-background --container-engine.name=moby
--kubernetes.enabled=false
@'
{
"min-api-version": "1.41",
+ "seccomp-profile": "/etc/rancher-desktop/seccomp.json",
"features": {
"containerd-snapshotter": true
},
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.en.md
index c5e2c15c086..0cada6b3273 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.en.md
@@ -95,7 +95,6 @@ GraalVM CE can be installed using `version-fox/vfox` in
Powershell 7 using the f
```shell
winget install --id version-fox.vfox --source winget --exact
if (-not (Test-Path -Path $PROFILE)) { New-Item -Type File -Path $PROFILE
-Force }; Add-Content -Path $PROFILE -Value 'Invoke-Expression "$(vfox activate
pwsh)"'
-# At this time, developer need to open a new Powershell 7 terminal
vfox add java
vfox install [email protected]
vfox use --global [email protected]
@@ -126,12 +125,12 @@ and configure it to use the `dockerd(moby)` `Container
Engine`.
```shell
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
-# Open a new PowerShell 7 terminal
rdctl start --application.start-in-background --container-engine.name=moby
--kubernetes.enabled=false
@'
{
"min-api-version": "1.41",
+ "seccomp-profile": "/etc/rancher-desktop/seccomp.json",
"features": {
"containerd-snapshotter": true
},
@@ -155,12 +154,12 @@ You can execute the following command in PowerShell 7:
```shell
iex "& { $(irm
https://raw.githubusercontent.com/microsoft/Windows-Containers/refs/heads/Main/helpful_tools/Install-DockerCE/uninstall-docker-ce.ps1)
} -Force"
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
-# Open a new PowerShell 7 terminal
rdctl start --application.start-in-background --container-engine.name=moby
--kubernetes.enabled=false
@'
{
"min-api-version": "1.41",
+ "seccomp-profile": "/etc/rancher-desktop/seccomp.json",
"features": {
"containerd-snapshotter": true
},
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md
index e19db62aeaf..2565ff41a5b 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md
@@ -179,7 +179,6 @@ sudo systemctl restart docker.service
```shell
winget install --id version-fox.vfox --source winget --exact
if (-not (Test-Path -Path $PROFILE)) { New-Item -Type File -Path $PROFILE
-Force }; Add-Content -Path $PROFILE -Value 'Invoke-Expression "$(vfox activate
pwsh)"'
-# 此时需要打开新的 Powershell 7 终端
vfox add java
vfox install [email protected]
vfox use --global [email protected]
@@ -200,12 +199,12 @@ wsl --install
```shell
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
-# 打开新的 PowerShell 7 终端
rdctl start --application.start-in-background --container-engine.name=moby
--kubernetes.enabled=false
@'
{
"min-api-version": "1.41",
+ "seccomp-profile": "/etc/rancher-desktop/seccomp.json",
"features": {
"containerd-snapshotter": true
},
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md
index 2eebe2cbf88..0437bbbe868 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md
@@ -183,7 +183,6 @@ OpenJDK 21 can be installed using `version-fox/vfox` in
Powershell 7 using the f
```shell
winget install --id version-fox.vfox --source winget --exact
if (-not (Test-Path -Path $PROFILE)) { New-Item -Type File -Path $PROFILE
-Force }; Add-Content -Path $PROFILE -Value 'Invoke-Expression "$(vfox activate
pwsh)"'
-# At this time, you need to open a new Powershell 7 terminal
vfox add java
vfox install [email protected]
vfox use --global [email protected]
@@ -204,12 +203,12 @@ and configure `dockerd(moby)` to use the `Container
Engine`.
```shell
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
-# Open a new PowerShell 7 terminal
rdctl start --application.start-in-background --container-engine.name=moby
--kubernetes.enabled=false
@'
{
"min-api-version": "1.41",
+ "seccomp-profile": "/etc/rancher-desktop/seccomp.json",
"features": {
"containerd-snapshotter": true
},
diff --git a/test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
b/test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
index 53e4917e846..367e6e41192 100644
--- a/test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
+++ b/test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
@@ -20,7 +20,6 @@
# This file is only used in the PowerShell 7 of ShardingSphere in GitHub
Actions environment and should not be executed manually in a development
environment.
# Background information can be found at
https://github.com/apache/shardingsphere/pull/35905 .
iex "& { $(irm
https://raw.githubusercontent.com/microsoft/Windows-Containers/refs/heads/Main/helpful_tools/Install-DockerCE/uninstall-docker-ce.ps1)
} -Force"
-winget install --id jazzdelightsme.WingetPathUpdater --source winget
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
rdctl start --application.start-in-background --container-engine.name=moby
--kubernetes.enabled=false
./test/native/src/test/resources/test-native/ps1/wait-for-rancher-desktop-backend.ps1
@@ -28,6 +27,7 @@ rdctl start --application.start-in-background
--container-engine.name=moby --kub
@'
{
"min-api-version": "1.41",
+ "seccomp-profile": "/etc/rancher-desktop/seccomp.json",
"features": {
"containerd-snapshotter": true
},
diff --git a/test/native/src/test/resources/testcontainers.properties
b/test/native/src/test/resources/testcontainers.properties
index 1d26333230f..970174d7d8d 100644
--- a/test/native/src/test/resources/testcontainers.properties
+++ b/test/native/src/test/resources/testcontainers.properties
@@ -16,4 +16,3 @@
#
pull.timeout = 240
-client.ping.timeout = 30
