Skip to content

Commit 749319e

Browse files
committed
change ratchetFrom to origin/2.x
1 parent 5c30142 commit 749319e

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,15 @@ jobs:
6969
run: |
7070
./mvnw -T 4C clean test \
7171
-Dcheckstyle.skip=false -Dpmd.skip=false -Dlicense.skip=false -DredisCaseEnabled=true \
72-
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
72+
-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn > mvn.log 2>&1 || {
73+
echo "## :negative_squared_cross_mark: Formatting issues found!" >> $GITHUB_STEP_SUMMARY
74+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
75+
cat mvn.log | grep "ERROR" | sed 's/Check if code needs formatting Check if code aligns with code style [0-9A-Z:.-]\+//' | sed 's/\[ERROR] //' | head -n -11 >> $GITHUB_STEP_SUMMARY
76+
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
77+
echo "Please run \`mvn spotless:apply\` to fix the formatting issues." >> $GITHUB_STEP_SUMMARY
78+
exit 1
79+
}
80+
7381
# step 5.2
7482
- name: "Test with Maven and Java${{ matrix.java }}"
7583
if: matrix.java != '8'

integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/annotation/AspectTransactional.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public class AspectTransactional {
3434
*/
3535
private String name = "";
3636

37+
// TODO revert changes after check the message
3738
/**
3839
* roll back for the Class
39-
*/
40-
private Class<? extends Throwable>[] rollbackFor = new Class[] {};
40+
*/private Class<? extends Throwable>[] rollbackFor = new Class[ ] {};
4141

4242
/**
4343
* roll back for the class name

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@
340340
<exclude>**/antlr/mysql/antlr/*.*</exclude>
341341
<exclude>**/antlr/mysql/stream/ANTLRNoCaseStringStream.java</exclude>
342342
</excludes>
343-
<ratchetFrom>HEAD</ratchetFrom>
343+
<ratchetFrom>refs/heads/2.x</ratchetFrom>
344344
<palantirJavaFormat>
345345
<version>${palantirJavaFormat.version}</version>
346346
</palantirJavaFormat>

0 commit comments

Comments
 (0)