Skip to content

Commit e7a185c

Browse files
Merge branch 'master' into feat(i18n/gi18n)
2 parents 518ec15 + 91f9864 commit e7a185c

File tree

426 files changed

+38225
-7005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

426 files changed

+38225
-7005
lines changed

.github/workflows/ci-main.yml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
# Service containers to run with `code-test`
5555
services:
5656
# Etcd service.
57-
# docker run -d --name etcd -p 2379:2379 -e ALLOW_NONE_AUTHENTICATION=yes bitnamilegacy/etcd:3.4.24
57+
# docker run -p 2379:2379 -e ALLOW_NONE_AUTHENTICATION=yes bitnamilegacy/etcd:3.4.24
5858
etcd:
5959
image: bitnamilegacy/etcd:3.4.24
6060
env:
@@ -75,7 +75,7 @@ jobs:
7575
- 6379:6379
7676

7777
# MySQL backend server.
78-
# docker run -d --name mysql \
78+
# docker run \
7979
# -p 3306:3306 \
8080
# -e MYSQL_DATABASE=test \
8181
# -e MYSQL_ROOT_PASSWORD=12345678 \
@@ -89,7 +89,7 @@ jobs:
8989
- 3306:3306
9090

9191
# MariaDb backend server.
92-
# docker run -d --name mariadb \
92+
# docker run \
9393
# -p 3307:3306 \
9494
# -e MYSQL_DATABASE=test \
9595
# -e MYSQL_ROOT_PASSWORD=12345678 \
@@ -103,7 +103,7 @@ jobs:
103103
- 3307:3306
104104

105105
# PostgreSQL backend server.
106-
# docker run -d --name postgres \
106+
# docker run \
107107
# -p 5432:5432 \
108108
# -e POSTGRES_PASSWORD=12345678 \
109109
# -e POSTGRES_USER=postgres \
@@ -150,7 +150,7 @@ jobs:
150150
--health-retries 10
151151
152152
# ClickHouse backend server.
153-
# docker run -d --name clickhouse \
153+
# docker run \
154154
# -p 9000:9000 -p 8123:8123 -p 9001:9001 \
155155
# clickhouse/clickhouse-server:24.11.1.2557-alpine
156156
clickhouse-server:
@@ -161,7 +161,7 @@ jobs:
161161
- 9001:9001
162162

163163
# Polaris backend server.
164-
# docker run -d --name polaris \
164+
# docker run \
165165
# -p 8090:8090 -p 8091:8091 -p 8093:8093 -p 9090:9090 -p 9091:9091 \
166166
# polarismesh/polaris-standalone:v1.17.2
167167
polaris:
@@ -198,6 +198,17 @@ jobs:
198198
ports:
199199
- 5236:5236
200200

201+
# openGauss server
202+
# docker run --privileged=true -e GS_PASSWORD=UTpass@1234 -p 9950:5432 opengauss/opengauss:7.0.0-RC1.B023
203+
gaussdb:
204+
image: opengauss/opengauss:7.0.0-RC1.B023
205+
env:
206+
GS_PASSWORD: UTpass@1234
207+
TZ: Asia/Shanghai
208+
ports:
209+
- 9950:5432
210+
211+
201212
zookeeper:
202213
image: zookeeper:3.8
203214
ports:
@@ -221,6 +232,12 @@ jobs:
221232
detached: true
222233
limit-access-to-actor: false
223234

235+
- name: Free Disk Space
236+
run: |
237+
df -h /
238+
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/hostedtoolcache/CodeQL /opt/hostedtoolcache/Python || true
239+
df -h /
240+
224241
- name: Start Apollo Containers
225242
run: docker compose -f ".github/workflows/apollo/docker-compose.yml" up -d --build
226243

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ jobs:
1717
steps:
1818
- name: Checkout Github Code
1919
uses: actions/checkout@v5
20-
20+
2121
- name: Set Up Golang Environment
2222
uses: actions/setup-go@v5
2323
with:
2424
go-version: 1.25
25+
cache: false
2526

2627
- name: Build CLI Binary
2728
run: |

.github/workflows/scripts/before_script.sh

100644100755
File mode changed.

.github/workflows/scripts/ci-main-clean.sh

Lines changed: 250 additions & 0 deletions
Large diffs are not rendered by default.

.github/workflows/scripts/ci-main.sh

100644100755
Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,54 @@ coverage=$1
66
for file in `find . -name go.mod`; do
77
dirpath=$(dirname $file)
88
echo $dirpath
9-
10-
# ignore mssql tests as its docker service failed
11-
# TODO remove this ignoring codes after the mssql docker service OK
12-
if [ "mssql" = $(basename $dirpath) ]; then
13-
continue 1
14-
fi
15-
9+
1610
# package kubecm was moved to sub ci procedure.
1711
if [ "kubecm" = $(basename $dirpath) ]; then
1812
continue 1
1913
fi
20-
14+
2115
# examples directory was moved to sub ci procedure.
2216
if [[ $dirpath =~ "/examples/" ]]; then
2317
continue 1
2418
fi
25-
19+
20+
if [[ $file =~ "/testdata/" ]]; then
21+
echo "ignore testdata path $file"
22+
continue 1
23+
fi
24+
2625
# Check if it's a contrib directory
2726
if [[ $dirpath =~ "/contrib/" ]]; then
2827
# Check if go version meets the requirement
2928
if ! go version | grep -qE "go${LATEST_GO_VERSION}"; then
3029
echo "ignore path $dirpath as go version is not ${LATEST_GO_VERSION}: $(go version)"
30+
# clean docker containers and images to free disk space
31+
# bash .github/workflows/scripts/ci-main-clean.sh "$dirpath"
3132
continue 1
3233
fi
3334
fi
34-
35-
if [[ $file =~ "/testdata/" ]]; then
36-
echo "ignore testdata path $file"
37-
continue 1
38-
fi
39-
40-
if [[ $dirpath = "." ]]; then
41-
# No space left on device error sometimes occurs in CI pipelines, so clean the cache before tests.
42-
go clean -cache
43-
fi
44-
35+
36+
# if [[ $dirpath = "." ]]; then
37+
# # No space left on device error sometimes occurs in CI pipelines, so clean the cache before tests.
38+
# go clean -cache
39+
# fi
40+
4541
cd $dirpath
4642
go mod tidy
4743
go build ./...
48-
44+
4945
# test with coverage
5046
if [ "${coverage}" = "coverage" ]; then
51-
go test ./... -race -coverprofile=coverage.out -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1
52-
53-
if grep -q "/gogf/gf/.*/v2" go.mod; then
54-
sed -i "s/gogf\/gf\(\/.*\)\/v2/gogf\/gf\/v2\1/g" coverage.out
55-
fi
47+
go test ./... -count=1 -race -coverprofile=coverage.out -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1
48+
49+
if grep -q "/gogf/gf/.*/v2" go.mod; then
50+
sed -i "s/gogf\/gf\(\/.*\)\/v2/gogf\/gf\/v2\1/g" coverage.out
51+
fi
5652
else
57-
go test ./... -race || exit 1
53+
go test ./... -count=1 -race || exit 1
5854
fi
59-
55+
6056
cd -
57+
# clean docker containers and images to free disk space
58+
# bash .github/workflows/scripts/ci-main-clean.sh "$dirpath"
6159
done

.github/workflows/scripts/ci-sub.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)