This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 897c42bfb25 workflow: fix reusable shell condition and nightly e2e
matrix excludes (#38253)
897c42bfb25 is described below
commit 897c42bfb25fc562ee9826e46f11e346868060f5
Author: Hongsheng Zhong <[email protected]>
AuthorDate: Sat Feb 28 10:22:02 2026 +0800
workflow: fix reusable shell condition and nightly e2e matrix excludes
(#38253)
* ci: harden required reusable shell condition
* e2e: fix nightly postgresql matrix excludes
* workflow: Print outputs in required reusable
---
.github/workflows/nightly-e2e-operation.yml | 8 +++++++-
.github/workflows/required-reusable.yml | 10 ++++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/nightly-e2e-operation.yml
b/.github/workflows/nightly-e2e-operation.yml
index 17172fd2418..5fd0b8fd636 100644
--- a/.github/workflows/nightly-e2e-operation.yml
+++ b/.github/workflows/nightly-e2e-operation.yml
@@ -101,7 +101,13 @@ jobs:
- operation: showprocesslist
image: { type: "e2e.docker.database.mariadb.images", version:
"mariadb:11" }
- operation: showprocesslist
- image: { type: "e2e.docker.database.postgresql.images", version:
"postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine"
}
+ image: { type: "e2e.docker.database.postgresql.images", version:
"postgres:11-alpine" }
+ - operation: showprocesslist
+ image: { type: "e2e.docker.database.postgresql.images", version:
"postgres:12-alpine" }
+ - operation: showprocesslist
+ image: { type: "e2e.docker.database.postgresql.images", version:
"postgres:13-alpine" }
+ - operation: showprocesslist
+ image: { type: "e2e.docker.database.postgresql.images", version:
"postgres:14-alpine" }
- operation: showprocesslist
image: { type: "e2e.docker.database.opengauss.images", version:
"opengauss/opengauss:3.1.0" }
steps:
diff --git a/.github/workflows/required-reusable.yml
b/.github/workflows/required-reusable.yml
index 6f914a8f168..98e42f0f40c 100644
--- a/.github/workflows/required-reusable.yml
+++ b/.github/workflows/required-reusable.yml
@@ -57,13 +57,19 @@ jobs:
run: |
GLOBAL_CACHE_PREFIX=$(echo '${{
steps.import-variables.outputs.GLOBAL_REPOSITORY }}' | sed 's/\//-/g')
echo "GLOBAL_CACHE_PREFIX=${GLOBAL_CACHE_PREFIX}" >> $GITHUB_OUTPUT
- if [ ${{ toJSON(github.repository) }} = ${{
steps.import-variables.outputs.GLOBAL_REPOSITORY }} ]; then
+ if [ "${{ github.repository }}" = "${{
steps.import-variables.outputs.GLOBAL_REPOSITORY }}" ]; then
echo "GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE=true" >> $GITHUB_OUTPUT
echo "GLOBAL_JOB_ENABLED=false" >> $GITHUB_OUTPUT
- if [ -z "${{ steps.import-variables.outputs.DISABLE_CI }}"] || [
"${{ steps.import-variables.outputs.DISABLE_CI }}"=="false" ] ; then
+ if [ -z "${{ steps.import-variables.outputs.DISABLE_CI }}" ] || [
"${{ steps.import-variables.outputs.DISABLE_CI }}" = "false" ]; then
echo "GLOBAL_JOB_ENABLED=true" >> $GITHUB_OUTPUT
fi
fi
+ - name: Print outputs
+ run: |
+ echo "GLOBAL_RUNS_ON(from import)=${{
steps.import-variables.outputs.GLOBAL_RUNS_ON }}"
+ echo "GLOBAL_JOB_ENABLED=${{
steps.check-job-executable.outputs.GLOBAL_JOB_ENABLED }}"
+ echo "GLOBAL_CACHE_PREFIX=${{
steps.check-job-executable.outputs.GLOBAL_CACHE_PREFIX }}"
+ echo "GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE=${{
steps.check-job-executable.outputs.GLOBAL_IS_NIGHTLY_JOB_EXECUTABLE }}"
outputs:
GLOBAL_RUNS_ON: ${{ steps.import-variables.outputs.GLOBAL_RUNS_ON }}
GLOBAL_JOB_ENABLED: ${{
steps.check-job-executable.outputs.GLOBAL_JOB_ENABLED }}
