Skip to content

Commit

Permalink
Reduce log size in CI runs
Browse files Browse the repository at this point in the history
  • Loading branch information
gtroitsk committed Aug 25, 2024
1 parent 3603b6c commit 1806bf9
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 19 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/daily.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
cache: 'maven'
- name: Build Quarkus main
run: |
git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B --no-transfer-progress -s .github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
- name: Tar Maven Repo
shell: bash
run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
QUARKUS_VERSION="-Dquarkus.platform.version=${{ matrix.quarkus-version }}"
fi
mvn -B -fae -s .github/mvn-settings.xml clean install -Dvalidate-format $QUARKUS_VERSION $EXCLUDE_MODULES
mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean install -Dvalidate-format $QUARKUS_VERSION $EXCLUDE_MODULES
- name: Zip Artifacts
if: failure()
run: |
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
run: tar -xzf maven-repo.tgz -C ~
- name: Build Quarkus CLI
run: |
git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B --no-transfer-progress -s ../../../.github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
- name: Install Quarkus CLI
run: |
cat <<EOF > ./quarkus-dev-cli
Expand All @@ -113,7 +113,7 @@ jobs:
./quarkus-dev-cli version
- name: Build
run: |
mvn -B -fae -s .github/mvn-settings.xml clean install -Pframework,examples,coverage -Dvalidate-format -Drun-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli" -Dquarkus.platform.version="${{ matrix.quarkus-version }}"
mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean install -Pframework,examples,coverage -Dvalidate-format -Drun-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli" -Dquarkus.platform.version="${{ matrix.quarkus-version }}"
- name: Generate Jacoco Report
run: |
cd coverage-report
Expand Down Expand Up @@ -195,7 +195,7 @@ jobs:
QUARKUS_VERSION="-Dquarkus.platform.version=${{ matrix.quarkus-version }}"
fi
mvn -B -fae -s .github/mvn-settings.xml clean install -Pframework,examples,native $QUARKUS_VERSION $EXCLUDE_MODULES
mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean install -Pframework,examples,native $QUARKUS_VERSION $EXCLUDE_MODULES
- name: Zip Artifacts
if: failure()
run: |
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
password: ${{ secrets.CI_REGISTRY_PASSWORD }}
- name: Build
run: |
mvn -B -fae -s .github/mvn-settings.xml clean install -Pframework,examples,kubernetes -Dquarkus.platform.version="${{ matrix.quarkus-version }}" -Dts.container.registry-url=${{ secrets.CI_REGISTRY }}
mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean install -Pframework,examples,kubernetes -Dquarkus.platform.version="${{ matrix.quarkus-version }}" -Dts.container.registry-url=${{ secrets.CI_REGISTRY }}
- name: Zip Artifacts
if: failure()
run: |
Expand Down Expand Up @@ -299,7 +299,7 @@ jobs:
password: ${{ secrets.CI_REGISTRY_PASSWORD }}
- name: Build
run: |
mvn -B -fae -s .github/mvn-settings.xml clean install -Pframework,examples,native,kubernetes -Dquarkus.platform.version="${{ matrix.quarkus-version }}" -Dts.container.registry-url=${{ secrets.CI_REGISTRY }}
mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean install -Pframework,examples,native,kubernetes -Dquarkus.platform.version="${{ matrix.quarkus-version }}" -Dts.container.registry-url=${{ secrets.CI_REGISTRY }}
- name: Zip Artifacts
if: failure()
run: |
Expand Down Expand Up @@ -338,7 +338,7 @@ jobs:
- name: Build in JVM mode
shell: bash
run: |
mvn -B -fae -s .github/mvn-settings.xml clean install -Pframework,examples -Dquarkus.platform.version="${{ matrix.quarkus-version }}"
mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean install -Pframework,examples -Dquarkus.platform.version="${{ matrix.quarkus-version }}"
- name: Zip Artifacts
shell: bash
if: failure()
Expand Down Expand Up @@ -401,7 +401,7 @@ jobs:
- name: Build in Native mode
shell: bash
run: |
mvn -B -fae -s .github/mvn-settings.xml clean install -Pframework,examples,native -Dquarkus.native.container-build=false -Dquarkus.platform.version="${{ matrix.quarkus-version }}" -Denable-win-race-debug=true
mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean install -Pframework,examples,native -Dquarkus.native.container-build=false -Dquarkus.platform.version="${{ matrix.quarkus-version }}" -Denable-win-race-debug=true
- name: Zip Artifacts
shell: bash
if: failure()
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
cache: 'maven'
- name: Build with Maven
run: |
mvn -V -B -s .github/mvn-settings.xml clean install -Pframework,examples -Dvalidate-format -DskipTests -DskipITs
mvn -V -B --no-transfer-progress -s .github/mvn-settings.xml clean install -Pframework,examples -Dvalidate-format -DskipTests -DskipITs
- name: Tar Maven Repo
shell: bash
run: tar -I 'pigz -9' -cf maven-repo-current-fw.tgz -C ~ .m2/repository
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
cache: 'maven'
- name: Build Quarkus main
run: |
git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B --no-transfer-progress -s .github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
- name: Tar Maven Repo
shell: bash
run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
run: tar -xzf maven-repo-current-fw.tgz -C ~
- name: Build in JVM mode
run: |
mvn -B -fae -s .github/mvn-settings.xml clean install -Pexamples
mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean install -Pexamples
- name: Detect flaky tests
id: flaky-test-detector
shell: bash
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
run: tar -xzf maven-repo.tgz -C ~
- name: Build Quarkus CLI
run: |
git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B --no-transfer-progress -s ../../../.github/mvn-settings.xml clean install -Dquickly -Dno-test-modules -Prelocations
- name: Install Quarkus CLI
run: |
cat <<EOF > ./quarkus-dev-cli
Expand All @@ -152,7 +152,7 @@ jobs:
./quarkus-dev-cli version
- name: Build in JVM mode
run: |
mvn -B -fae -s .github/mvn-settings.xml clean install -Pframework,examples -Drun-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli" -Dquarkus.platform.version="${{ matrix.quarkus-version }}"
mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean install -Pframework,examples -Drun-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli" -Dquarkus.platform.version="${{ matrix.quarkus-version }}"
- name: Detect flaky tests
id: flaky-test-detector
shell: bash
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
run: tar -xzf maven-repo-current-fw.tgz -C ~
- name: Build
run: |
mvn -B -fae -s .github/mvn-settings.xml clean install -Pexamples,native -pl '${{ matrix.examples }}'
mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean install -Pexamples,native -pl '${{ matrix.examples }}'
- name: Detect flaky tests
id: flaky-test-detector
shell: bash
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
- name: Build in JVM mode
shell: bash
run: |
mvn -B -fae -s .github/mvn-settings.xml clean install -Pframework,examples -Dquarkus.platform.version="${{ matrix.quarkus-version }}"
mvn -B --no-transfer-progress -fae -s .github/mvn-settings.xml clean install -Pframework,examples -Dquarkus.platform.version="${{ matrix.quarkus-version }}"
- name: Detect flaky tests
shell: bash
id: flaky-test-detector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ private boolean isCustomBuildRequired() {
}

private String[] getBuildNativeExecutableCmd() {
Stream<String> cmdStream = Stream.of(mvnCmd(), "clean", "install", "-Dquarkus.build.skip=false",
"-Dnative", "-DskipTests", "-DskipITs", "-Dcheckstyle.skip",
Stream<String> cmdStream = Stream.of(mvnCmd(), "-B", "--no-transfer-progress", "clean", "install",
"-Dquarkus.build.skip=false", "-Dnative", "-DskipTests", "-DskipITs", "-Dcheckstyle.skip",
toMvnSystemProperty(PLATFORM_VERSION.getPropertyKey(), getVersion()),
toMvnSystemProperty(PLATFORM_GROUP_ID.getPropertyKey(), PLATFORM_GROUP_ID.get()),
toMvnSystemProperty(PLUGIN_VERSION.getPropertyKey(), getPluginVersion()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public final class MavenUtils {
public static final String DISPLAY_ERRORS = "-e";
public static final String BATCH_MODE = "-B";
public static final String DISPLAY_VERSION = "-V";
public static final String SKIP_PROGRESS = "--no-transfer-progress";
public static final String SKIP_CHECKSTYLE = "-Dcheckstyle.skip";
public static final String QUARKUS_PROFILE = "quarkus.profile";
public static final String QUARKUS_PROPERTY_PREFIX = "quarkus";
Expand All @@ -54,7 +55,9 @@ public static void build(ServiceContext serviceContext, Path basePath, List<Stri
List<String> command = mvnCommand(serviceContext);
command.addAll(extraMavenArgs);
command.add(DISPLAY_ERRORS);
command.add(BATCH_MODE);
command.add(DISPLAY_VERSION);
command.add(SKIP_PROGRESS);
command.add(PACKAGE_GOAL);
try {
new Command(command)
Expand All @@ -70,6 +73,7 @@ public static void build(ServiceContext serviceContext, Path basePath, List<Stri
public static List<String> devModeMavenCommand(ServiceContext serviceContext, List<String> systemProperties) {
List<String> command = mvnCommand(serviceContext);
command.addAll(Arrays.asList(SKIP_CHECKSTYLE, SKIP_ITS));
command.addAll(Arrays.asList(BATCH_MODE, SKIP_PROGRESS));
command.addAll(systemProperties);
command.add(withProperty("debug", "false"));
command.add("quarkus:dev");
Expand All @@ -81,6 +85,8 @@ public static List<String> mvnCommand(ServiceContext serviceContext) {
List<String> args = new ArrayList<>();
args.add(MVN_COMMAND);
args.add(DISPLAY_ERRORS);
args.add(SKIP_PROGRESS);
args.add(BATCH_MODE);
args.add(withQuarkusProfile(serviceContext));
withMavenRepositoryLocalIfSet(args);
withProperties(args);
Expand Down Expand Up @@ -109,7 +115,8 @@ public static void installParentPomsIfNeeded(Path basePath) {

private static void installParentPom(Path relativePath) {
List<String> args = new ArrayList<>();
args.addAll(asList(MVN_COMMAND, DISPLAY_ERRORS, INSTALL_GOAL, SKIP_CHECKSTYLE, SKIP_TESTS, SKIP_ITS, "-pl", "."));
args.addAll(asList(MVN_COMMAND, DISPLAY_ERRORS, BATCH_MODE, SKIP_PROGRESS, INSTALL_GOAL, SKIP_CHECKSTYLE, SKIP_TESTS,
SKIP_ITS, "-pl", "."));
withMavenRepositoryLocalIfSet(args);
withProperties(args);

Expand Down

0 comments on commit 1806bf9

Please sign in to comment.