Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Arctic-1293][Imporvement][CI]: Run code style check first when run github ci actions. #1326

Closed
wants to merge 11 commits into from
Closed

[Arctic-1293][Imporvement][CI]: Run code style check first when run github ci actions. #1326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
486e85b
Run code style check first when run github ci actions.
baiyangtx Apr 11, 2023
1fedf01
skip checkstyle during ci build steps as of already run checkstyle be…
baiyangtx Apr 11, 2023
7fc5a13
Merge branch 'master' into 1293-run-validate-first-in-ci
zhoujinsong Apr 11, 2023
e93b2dc
test ci for EOF problem in jacoco
baiyangtx Apr 11, 2023
143aa3f
Merge remote-tracking branch 'origin/1293-run-validate-first-in-ci' i…
baiyangtx Apr 11, 2023
4c5d7f4
add -X for CI
baiyangtx Apr 12, 2023
f1c48b9
upgrade maven-surefire-plugin to 3.0.0
baiyangtx Apr 12, 2023
376f3c7
remove maven scalestyle check during test
baiyangtx Apr 12, 2023
efd4345
remove validate
baiyangtx Apr 12, 2023
e599148
add shutdown hook
baiyangtx Apr 12, 2023
b238fc1
add -B
baiyangtx Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/core-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,16 @@ jobs:
distribution: 'temurin'
cache: maven


- name: Build all module with Maven
run: mvn clean install -pl '!trino'
run: mvn clean install -pl '!trino' -B -X

- name: debug jacoco EOF problems
if: ${{ always() }}
run: ls -lha /home/runner/work/arctic/arctic/flink/v1.12/flink/target/jacoco.exec

- name: Code coverage
uses: codecov/codecov-action@v3
with:
verbose: true
flags: core
flags: core
7 changes: 5 additions & 2 deletions .github/workflows/trino-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,14 @@ jobs:
distribution: 'temurin'
cache: maven

- name: Run code checkstyle
run: mvn validate

- name: Install dependency with Maven
run: mvn clean install -DskipTests -pl 'ams/ams-api,core,hive' -am
run: mvn clean install -DskipTests -Dcheckstyle.skip=true -pl 'ams/ams-api,core,hive' -am

- name: Build with Maven
run: mvn clean test -pl 'trino'
run: mvn clean test -pl 'trino' -Dcheckstyle.skip=true

- name: Code coverage
uses: codecov/codecov-action@v3
Expand Down
24 changes: 20 additions & 4 deletions flink/v1.12/flink/src/test/java/com/netease/arctic/flink/FlinkTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,18 +317,34 @@ protected static void commit(KeyedTable keyedTable, WriteResult result, boolean
}
}

protected static TaskWriter<RowData> createKeyedTaskWriter(KeyedTable keyedTable, RowType rowType,
boolean base) {
protected static TaskWriter<RowData> createKeyedTaskWriter(
KeyedTable keyedTable, RowType rowType,
boolean base) {
return createKeyedTaskWriter(keyedTable, rowType, base, 3);
}

protected static TaskWriter<RowData> createKeyedTaskWriter(KeyedTable keyedTable, RowType rowType,
boolean base, long mask) {
protected static TaskWriter<RowData> createKeyedTaskWriter(
KeyedTable keyedTable, RowType rowType,
boolean base, long mask) {
ArcticRowDataTaskWriterFactory taskWriterFactory =
new ArcticRowDataTaskWriterFactory(keyedTable, rowType, base);
taskWriterFactory.setMask(mask);
taskWriterFactory.initialize(0, 0);
return taskWriterFactory.create();
}

static {
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public synchronized void start() {
LOG.info("JACOCO SHUTDOWN HOOK START");
super.start();
}

@Override
public void run() {
LOG.info("JACOCO SHUTDOWN HOOK RUN");
}
});
}
}
26 changes: 13 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
<maven-scala-plugin.version>4.3.0</maven-scala-plugin.version>
<maven-antlr4-plugin.version>4.3</maven-antlr4-plugin.version>
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
Expand Down Expand Up @@ -522,23 +522,23 @@
<file>.scalafmt.conf</file>
</scalafmt>
</scala>
<pom>
<includes>
<include>pom.xml</include>
</includes>
<sortPom>
<encoding>${project.build.sourceEncoding}</encoding>
<expandEmptyElements>true</expandEmptyElements>
<indentSchemaLocation>true</indentSchemaLocation>
<nrOfIndentSpace>4</nrOfIndentSpace>
</sortPom>
</pom>
<pom>
<includes>
<include>pom.xml</include>
</includes>
<sortPom>
<encoding>${project.build.sourceEncoding}</encoding>
<expandEmptyElements>true</expandEmptyElements>
<indentSchemaLocation>true</indentSchemaLocation>
<nrOfIndentSpace>4</nrOfIndentSpace>
</sortPom>
</pom>

</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
Expand Down