Skip to content

Commit

Permalink
Merge branch '2.x' into fix_git_info
Browse files Browse the repository at this point in the history
  • Loading branch information
xingfudeshi authored Jan 18, 2024
2 parents d87676c + b646e5b commit 4892ef1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ jobs:
docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \
arm64v8/ubuntu:20.04 \
bash -exc 'apt-get update -y && \
apt-get install python2 -y && \
python2 --version && \
apt-get install make gcc g++ -y && \
apt-get install maven -y && \
mvn -version && \
mvn clean install \
Expand Down
1 change: 1 addition & 0 deletions changes/en-us/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6264](https://github.com/apache/incubator-seata/pull/6264)] fix jib-maven-plugin build failed
- [[#6246](https://github.com/apache/incubator-seata/pull/6246)] build the frontend at the same time as the maven build
- [[#6271](https://github.com/apache/incubator-seata/pull/6271)] unifty the git information
- [[#6265](https://github.com/apache/incubator-seata/pull/6265)] optimization fails to build frontend on arm64
- [[#6267](https://github.com/apache/incubator-seata/pull/6267)] add Server deserialization validation

### security:
Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
- [[#6264](https://github.com/apache/incubator-seata/pull/6264)] 修复 jib-maven-plugin 编译失败问题
- [[#6246](https://github.com/apache/incubator-seata/pull/6246)] 在maven打包的同时打包前端资源
- [[#6271](https://github.com/apache/incubator-seata/pull/6271)] 统一git信息
- [[#6265](https://github.com/apache/incubator-seata/pull/6265)] 优化在 arm64 上构建前端失败的问题
- [[#6267](https://github.com/apache/incubator-seata/pull/6267)] 增加 Server 反序列化校验

### security:
Expand Down

0 comments on commit 4892ef1

Please sign in to comment.