optimize: macos workflow support arm testing (#6549)

apache · May 16, 2024 · ec47baa · ec47baa
1 parent 424c826
commit ec47baa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,7 +3,6 @@ name: "test"
 on:
   push:
     branches: [ test*, "*.*.*" ]
-
 jobs:
   # job 1
   test:
@@ -40,24 +39,14 @@ jobs:
           java-version: ${{ matrix.java }}
       # step 3
       ## step 3.1: for Ubuntu and MacOS
-      - name: "Test with Maven on MacOS"
-        if: matrix.os == 'macos'
-        run: |
-          ./mvnw     -version;
-          ./mvnw     -T 4C clean test \
-                     -P args-for-client-test \
-                     -Dspring-boot.version=${{ matrix.springboot }} \
-                     -Dmaven.git-commit-id.skip=true \
-                     -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
-      - name: "Test with Maven on ‘ubuntu' OS"
-        if: matrix.os == 'ubuntu'
+      - name: "Test with Maven on '${{ matrix.os }}' OS"
+        if: matrix.os != 'windows'
         run: |
-          ./mvnw     -version;
-          ./mvnw     -T 4C clean test \
-                     -P args-for-client-test \
-                     -Dspring-boot.version=${{ matrix.springboot }} \
-                     -Dmaven.git-commit-id.skip=true \
-                     -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+          if [ "${{ matrix.os }}" == "macos" ]; then
+            ./mvnw -T 4C clean test -P args-for-client-test  -P arrch64 -Dspring-boot.version=${{ matrix.springboot }} -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+          else
+            ./mvnw -T 4C clean test -P args-for-client-test -Dspring-boot.version=${{ matrix.springboot }} -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+          fi
       ## step 3.2: for Windows
       - name: "Build with Maven on 'windows' OS (Skip tests)"
         if: matrix.os == 'windows'
@@ -98,12 +87,11 @@ jobs:
       - name: "Test with Maven on '${{ matrix.os }}' OS"
         if: matrix.os != 'windows'
         run: |
-          ./mvnw     -version;
-          ./mvnw     -T 4C clean install \
-                     -P args-for-client-test \
-                     -Dspring-boot.version=${{ matrix.springboot }} \
-                     -Dmaven.git-commit-id.skip=true \
-                     -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+          if [ "${{ matrix.os }}" == "macos" ]; then
+            ./mvnw -T 4C clean test -P args-for-client-test  -P arrch64 -Dspring-boot.version=${{ matrix.springboot }} -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+          else
+            ./mvnw -T 4C clean test -P args-for-client-test -Dspring-boot.version=${{ matrix.springboot }} -Dmaven.git-commit-id.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+          fi
       ## step 3.2: for Windows
       - name: "Build with Maven on 'windows' OS (Skip tests)"
         if: matrix.os == 'windows'

diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -134,6 +134,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6548](https://github.com/apache/incubator-seata/pull/6548)] upgrade the byte-buddy version to 1.14.15
 - [[#6539](https://github.com/apache/incubator-seata/pull/6539)] add subcomponents license
 - [[#6540](https://github.com/apache/incubator-seata/pull/6540)] exclude com.google.guava:listenablefuture
+- [[#6549](https://github.com/apache/incubator-seata/pull/6549)] macos workflow support arm testing
 
 ### security:
 - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -133,6 +133,7 @@
 - [[#6548](https://github.com/apache/incubator-seata/pull/6548)] 升级byte-buddy版本至1.14.15
 - [[#6539](https://github.com/apache/incubator-seata/pull/6539)] 增加组件 license
 - [[#6540](https://github.com/apache/incubator-seata/pull/6540)] 排除  com.google.guava:listenablefuture 依赖
+- [[#6549](https://github.com/apache/incubator-seata/pull/6549)] 支持macos arm架构单测
 
 ### security:
 - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] 升级Guava依赖版本，修复安全漏洞