Skip to content

Commit fde59c1

Browse files
authored
optimize: add independent nacos for the CI process. (#6836)
1 parent f2577cf commit fde59c1

File tree

7 files changed

+17
-5
lines changed

7 files changed

+17
-5
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ jobs:
1616
ports:
1717
- 6379:6379
1818
options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
19+
nacos:
20+
image: nacos/nacos-server:v2.4.2
21+
ports:
22+
- 8848:8848
23+
env:
24+
MODE: standalone
25+
SPRING_SECURITY_ENABLED: false
26+
options: --health-cmd="curl -f http://localhost:8848/nacos" --health-interval=10s --health-timeout=5s --health-retries=3 --health-start-period=30s
1927
runs-on: ubuntu-latest
2028
strategy:
2129
fail-fast: false

changes/en-us/2.x.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ Add changes here for all PR submitted to the 2.x branch.
8787
- [[#6808](https://github.com/apache/incubator-seata/pull/6808)] change version to 2.2.0-SNAPSHOT
8888
- [[#6819](https://github.com/apache/incubator-seata/pull/6819)] merge the packaging processes of namingserver and seata-server
8989
- [[#6827](https://github.com/apache/incubator-seata/pull/6827)] rename namingserver registry type
90+
- [[#6836](https://github.com/apache/incubator-seata/pull/6836)] add independent nacos for the CI process
9091

9192

9293
### refactor:
@@ -137,5 +138,6 @@ Thanks to these contributors for their code commits. Please report an unintended
137138
- [xingfudeshi](https://github.com/xingfudeshi)
138139
- [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
139140
- [LegGasai](https://github.com/LegGasai)
141+
- [yangli-stu](https://github.com/yangli-stu)
140142

141143
Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

changes/zh-cn/2.x.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
- [[#6808](https://github.com/apache/incubator-seata/pull/6808)] 修改版本号为2.2.0-SNAPSHOT
8888
- [[#6819](https://github.com/apache/incubator-seata/pull/6819)] namingserver与server的合并打包
8989
- [[#6827](https://github.com/apache/incubator-seata/pull/6827)] 重命名namingserver注册类型改为seata
90+
- [[#6836](https://github.com/apache/incubator-seata/pull/6836)] 为CI流程增加独立nacos
9091

9192

9293
### refactor:
@@ -138,6 +139,7 @@
138139
- [xingfudeshi](https://github.com/xingfudeshi)
139140
- [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
140141
- [LegGasai](https://github.com/LegGasai)
142+
- [yangli-stu](https://github.com/yangli-stu)
141143

142144
同时,我们收到了社区反馈的很多有价值的issue和建议,非常感谢大家。
143145

config/seata-config-nacos/src/test/java/org/apache/seata/config/nacos/NacosMockTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
public class NacosMockTest {
4242
private static ConfigService configService;
43-
private static final String NACOS_ENDPOINT = "console.nacos.io:80";
43+
private static final String NACOS_ENDPOINT = "127.0.0.1:8848";
4444

4545
private static final String NACOS_GROUP = "SEATA_GROUP";
4646

config/seata-config-nacos/src/test/resources/registry-mock.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ registry {
2121

2222
nacos {
2323
application = "seata-server"
24-
serverAddr = "console.nacos.io:80"
24+
serverAddr = "127.0.0.1:8848"
2525
group = "SEATA_GROUP"
2626
namespace = ""
2727
username = ""
@@ -77,7 +77,7 @@ config {
7777
type = "nacos"
7878

7979
nacos {
80-
serverAddr = "console.nacos.io:80"
80+
serverAddr = "127.0.0.1:8848"
8181
namespace = ""
8282
group = "SEATA_GROUP"
8383
dataId = "seata-mock"

config/seata-config-nacos/src/test/resources/registry-test.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ config {
8989
dataId = "seata.properties"
9090
}
9191
test {
92-
serverAddr = "console.nacos.io:80"
92+
serverAddr = "127.0.0.1:8848"
9393
namespace = ""
9494
group = "SEATA_GROUP"
9595
dataId = ""

config/seata-config-nacos/src/test/resources/registry.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ registry {
2121

2222
nacos {
2323
application = "seata-server"
24-
serverAddr = "console.nacos.io:80"
24+
serverAddr = "127.0.0.1:8848"
2525
group = "SEATA_GROUP"
2626
namespace = ""
2727
username = ""

0 commit comments

Comments
 (0)