This is an automated email from the ASF dual-hosted git repository.
jimin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 832d4c6f36 bugfix: fix the CI build issue on the ARM64 platform (#6948)
832d4c6f36 is described below
commit 832d4c6f36710f8a9476dbc7b6943daf665022c5
Author: xingfudeshi <[email protected]>
AuthorDate: Sat Oct 26 10:57:47 2024 +0800
bugfix: fix the CI build issue on the ARM64 platform (#6948)
---
.github/workflows/build.yml | 6 +++++-
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a5bdf5c2e3..dd84681ba7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -84,11 +84,15 @@ jobs:
- name: "Set up QEMU"
id: qemu
uses: docker/setup-qemu-action@v3
+ with:
+ platforms: arm64
+ - name: "Set up Docker Buildx"
+ uses: docker/setup-buildx-action@v3
# step 3
- name: "Build with Maven on 'arm64v8/ubuntu:20.04' OS (Skip tests)"
run: |
docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \
- arm64v8/ubuntu:20.04 \
+ --platform linux/arm64 arm64v8/ubuntu:20.04 \
bash -exc 'apt-get update -y && \
apt-get install maven -y && \
apt-get install -y python3 python3-pip
python3-distutils && \
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 84c7edd955..2d1b8ffe1f 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -17,6 +17,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6932](https://github.com/apache/incubator-seata/pull/6932)] when enabling
local transactions, the lock contention failure in file & raft mode does not
exit, leading to a lingering lock
- [[#6940](https://github.com/apache/incubator-seata/pull/6940)] Fix
NacosRegistry lookup behavior transactionServiceGroup is empty causing NPE error
- [[#6943](https://github.com/apache/incubator-seata/pull/6943)] fix the
conversion error for `convertBranchSession` in concurrent environment.
+- [[#6948](https://github.com/apache/incubator-seata/pull/6948)] Fix the CI
build issue on the ARM64 platform
- [[#6947](https://github.com/apache/incubator-seata/pull/6947)] fix npe for
nacos registry when look up address
### optimize:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index c63c19b806..321e751c6a 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -17,6 +17,7 @@
- [[#6932](https://github.com/apache/incubator-seata/pull/6932)]
修复开启本地事务时file&raft模式下锁争抢失败未退出导致可能出现残留锁
- [[#6940](https://github.com/apache/incubator-seata/pull/6940)]
修复NacosRegistry lookup 行为 transactionServiceGroup 为空导致 NPE 错误
- [[#6943](https://github.com/apache/incubator-seata/pull/6943)] 修复并发状态下
`convertBranchSession` 转换报错问题
+- [[#6948](https://github.com/apache/incubator-seata/pull/6948)]
修复在ARM64平台下CI构建出错的问题
- [[#6947](https://github.com/apache/incubator-seata/pull/6947)]
修复nacos注册中心查询可用地址时的空指针问题
### optimize:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
