Skip to content

Commit

Permalink
Install compiled artifacts
Browse files Browse the repository at this point in the history
Multi-Release JARs are causing error_prone/javadoc/surefire to use the latest compilation unit
while resolving dependencies for other modules.
  • Loading branch information
wendigo committed Feb 27, 2025
1 parent be9dfef commit 518256b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Maven Checks
run: |
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
$MAVEN clean verify -B --strict-checksums -V -T 1C -DskipTests -P ci
$MAVEN clean install verify -B --strict-checksums -V -T 1C -DskipTests -P ci
- name: Remove Trino from local Maven repo to avoid caching it
# Avoid caching artifacts built in this job, cache should only include dependencies
if: steps.cache.outputs.cache-hit != 'true' && matrix.cache == 'true'
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
run: |
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
# Skip checks, these are run in `maven-checks` job and e.g. checkstyle is expensive.
$MAVEN ${MAVEN_TEST} -T 1C clean compile test-compile -DskipTests -Dair.check.skip-all=true ${MAVEN_GIB} -Dgib.buildUpstream=never -P errorprone-compiler \
$MAVEN ${MAVEN_TEST} -T 1C clean compile test-compile install -DskipTests -Dair.check.skip-all=true ${MAVEN_GIB} -Dgib.buildUpstream=never -P errorprone-compiler \
-pl '!:trino-docs,!:trino-server'
test-jdbc-compatibility:
Expand Down Expand Up @@ -328,7 +328,7 @@ jobs:
- name: Maven Tests
id: tests
run: |
$MAVEN test ${MAVEN_TEST} -pl '
$MAVEN test install ${MAVEN_TEST} -pl '
!:trino-base-jdbc,
!:trino-bigquery,
!:trino-cassandra,
Expand Down
15 changes: 14 additions & 1 deletion client/trino-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,20 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<!-- Order is important - we want to attach JDK 11 to the reactor -->
<execution>
<id>compile-java-11</id>
<goals>
<goal>compile</goal>
</goals>
<phase>compile</phase>
<configuration>
<multiReleaseOutput>true</multiReleaseOutput>
<release>11</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java</compileSourceRoot>
</compileSourceRoots>
</configuration>
</execution>
<execution>
<id>compile-java-22</id>
<goals>
Expand Down

0 comments on commit 518256b

Please sign in to comment.