Skip to content
Merged
Changes from all commits
Commits
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
25 changes: 20 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Maven Checks
run: |
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
$RETRY $MAVEN clean install -B --strict-checksums -V -T C1 -DskipTests -P ci -pl '!:trino-server-rpm'
$RETRY $MAVEN clean verify -B --strict-checksums -V -T C1 -DskipTests -P ci -pl '!:trino-server-rpm'
- name: Test Server RPM
run: |
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
Expand Down Expand Up @@ -90,17 +90,17 @@ jobs:
cache: 'maven'
- name: Configure Problem Matchers
run: echo "::add-matcher::.github/problem-matcher.json"
- name: Maven Install
- name: Maven Package
run: |
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
$RETRY $MAVEN clean install ${MAVEN_FAST_INSTALL} ${MAVEN_GIB} -pl '!:trino-docs,!:trino-server,!:trino-server-rpm'
$RETRY $MAVEN clean package ${MAVEN_FAST_INSTALL} ${MAVEN_GIB} -pl '!:trino-docs,!:trino-server,!:trino-server-rpm'
- name: Error Prone Checks
run: |
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
# Run Error Prone on one module with a retry to ensure all runtime dependencies are fetched
$RETRY $MAVEN ${MAVEN_TEST} -T C1 clean test-compile -P gib,errorprone-compiler -pl ':trino-spi'
$RETRY $MAVEN ${MAVEN_TEST} -T C1 clean verify -DskipTests -P gib,errorprone-compiler -pl ':trino-spi'
# The main Error Prone run
$MAVEN ${MAVEN_TEST} -T C1 clean test-compile -P gib,errorprone-compiler \
$MAVEN ${MAVEN_TEST} -T C1 clean verify -DskipTests -P gib,errorprone-compiler \
Comment on lines 101 to 103
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the non-controversial part and we can merge it right away if extracted.

-pl '!:trino-docs,!:trino-server,!:trino-server-rpm'

web-ui-checks:
Expand Down Expand Up @@ -164,6 +164,9 @@ jobs:
path: |
**/surefire-reports/TEST-*.xml
retention-days: ${{ env.TEST_REPORT_RETENTION_DAYS }}
- name: Clean local Maven repo
if: steps.cache.outputs.cache-hit != 'true'
run: rm -rf ~/.m2/repository
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a code comment?

The commit changes some install into package, so worth noting why it's still worthwhile to delete ~/.m2/repository.

Also, why ~/.m2/repository and not eg ~/.m2/repository/io/trino ?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This removes the whole local repo to avoid creating a cache entry from this job since it might not be the one with the most dependencies.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it worth a code comment?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


hive-tests:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -288,6 +291,9 @@ jobs:
path: |
**/surefire-reports/TEST-*.xml
retention-days: ${{ env.TEST_REPORT_RETENTION_DAYS }}
- name: Clean local Maven repo
if: steps.cache.outputs.cache-hit != 'true'
run: rm -rf ~/.m2/repository

test-other-modules:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -360,6 +366,9 @@ jobs:
path: |
**/surefire-reports/TEST-*.xml
retention-days: ${{ env.TEST_REPORT_RETENTION_DAYS }}
- name: Clean local Maven repo
if: steps.cache.outputs.cache-hit != 'true'
run: rm -rf ~/.m2/repository

build-test-matrix:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -527,6 +536,9 @@ jobs:
path: |
**/surefire-reports/TEST-*.xml
retention-days: ${{ env.TEST_REPORT_RETENTION_DAYS }}
- name: Clean local Maven repo
if: steps.cache.outputs.cache-hit != 'true'
run: rm -rf ~/.m2/repository

build-pt:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -593,6 +605,9 @@ jobs:
testing/trino-product-tests/target/*-executable.jar
client/trino-cli/target/*-executable.jar
retention-days: 1
- name: Clean local Maven repo
if: steps.cache.outputs.cache-hit != 'true'
run: rm -rf ~/.m2/repository

pt:
runs-on: ubuntu-latest
Expand Down