forked from apache/incubator-seata
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.x' of https://github.com/apache/incubator-seata into …
…clever_tcc_fence_hook_function
- Loading branch information
Showing
245 changed files
with
12,707 additions
and
7,463 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,28 +26,33 @@ jobs: | |
| - name: "Checkout" | ||
| uses: actions/checkout@v3 | ||
| # step 2 | ||
| - name: "Use Python 3.x" | ||
| uses: actions/setup-python@v2 | ||
| with: | ||
| python-version: '3.12' | ||
| # step 3 | ||
| - name: "Set up Java JDK" | ||
| uses: actions/[email protected] | ||
| with: | ||
| distribution: 'zulu' | ||
| java-version: ${{ matrix.java }} | ||
| # step 3 | ||
| # step 4 | ||
| - name: "Print maven version" | ||
| run: ./mvnw -version | ||
| # step 4.1 | ||
| # step 5.1 | ||
| - name: "Test, Check style, Check PMD, Check license with Maven and Java8" | ||
| if: matrix.java == '8' | ||
| run: | | ||
| ./mvnw -T 4C clean test \ | ||
| -Dcheckstyle.skip=false -Dpmd.skip=false -Dlicense.skip=false -DredisCaseEnabled=true \ | ||
| -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; | ||
| # step 4.2 | ||
| # step 5.2 | ||
| - name: "Test with Maven and Java${{ matrix.java }}" | ||
| if: matrix.java != '8' | ||
| run: | | ||
| ./mvnw -T 4C clean test \ | ||
| -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; | ||
| # step 5 | ||
| # step 6 | ||
| - name: "Codecov" | ||
| if: matrix.java == '8' | ||
| uses: codecov/[email protected] | ||
|
|
@@ -77,10 +82,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 && \ | ||
| apt-get install -y python3 python3-pip python3-distutils && \ | ||
| apt-get install -y build-essential && \ | ||
| mvn -version && \ | ||
| mvn clean install \ | ||
| -Prelease-seata \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,22 +32,32 @@ jobs: | |
| - name: "Checkout" | ||
| uses: actions/checkout@v3 | ||
| # step 2 | ||
| - name: "Use Python 3.x" | ||
| uses: actions/setup-python@v2 | ||
| with: | ||
| python-version: '3.12' | ||
| # step 3 | ||
| - name: "Set up Java JDK" | ||
| uses: actions/[email protected] | ||
| with: | ||
| distribution: 'zulu' | ||
| java-version: ${{ matrix.java }} | ||
| # step 3 | ||
| ## step 3.1: for Ubuntu and MacOS | ||
| # step 4 | ||
| ## step 4.1: for Ubuntu and MacOS | ||
| - name: "Test with Maven on '${{ matrix.os }}' OS" | ||
| if: matrix.os != 'windows' | ||
| run: | | ||
| if [ "${{ matrix.os }}" == "macos" ]; then | ||
| python3 -m ensurepip --upgrade; | ||
| python3 -m pip install --upgrade pip setuptools; | ||
| if ! python3 -c "import distutils" &>/dev/null; then | ||
| python3 -m pip install --upgrade setuptools | ||
| fi | ||
| ./mvnw -T 4C clean test -P args-for-client-test -P arrch64 -Dspring-boot.version=${{ matrix.springboot }} -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 }} -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; | ||
| fi | ||
| ## step 3.2: for Windows | ||
| ## step 4.2: for Windows | ||
| - name: "Build with Maven on 'windows' OS (Skip tests)" | ||
| if: matrix.os == 'windows' | ||
| run: | # Skip tests, because too many errors in unit-test. | ||
|
|
@@ -77,22 +87,32 @@ jobs: | |
| - name: "Checkout" | ||
| uses: actions/checkout@v3 | ||
| # step 2 | ||
| - name: "Use Python 3.x" | ||
| uses: actions/setup-python@v2 | ||
| with: | ||
| python-version: '3.12' | ||
| # step 3 | ||
| - name: "Set up Java JDK" | ||
| uses: actions/[email protected] | ||
| with: | ||
| distribution: 'zulu' | ||
| java-version: ${{ matrix.java }} | ||
| # step 3 | ||
| ## step 3.1: for Ubuntu and MacOS | ||
| # step 4 | ||
| ## step 4.1: for Ubuntu and MacOS | ||
| - name: "Test with Maven on '${{ matrix.os }}' OS" | ||
| if: matrix.os != 'windows' | ||
| run: | | ||
| if [ "${{ matrix.os }}" == "macos" ]; then | ||
| python3 -m ensurepip --upgrade; | ||
| python3 -m pip install --upgrade pip setuptools; | ||
| if ! python3 -c "import distutils" &>/dev/null; then | ||
| python3 -m pip install --upgrade setuptools | ||
| fi | ||
| ./mvnw -T 4C clean test -P args-for-client-test -P arrch64 -Dspring-boot.version=${{ matrix.springboot }} -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 }} -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; | ||
| fi | ||
| ## step 3.2: for Windows | ||
| ## step 4.2: for Windows | ||
| - name: "Build with Maven on 'windows' OS (Skip tests)" | ||
| if: matrix.os == 'windows' | ||
| run: | # Skip tests, because too many errors in unit-test. | ||
|
|
@@ -131,6 +151,8 @@ jobs: | |
| arm64v8/ubuntu:20.04 \ | ||
| bash -exc 'apt-get update -y && \ | ||
| apt-get install maven -y && \ | ||
| apt-get install -y python3 python3-pip python3-distutils && \ | ||
| apt-get install -y build-essential && \ | ||
| mvn -version && \ | ||
| mvn -T 4C clean install \ | ||
| -Dspring-boot.version=${{ matrix.springboot }} \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.