Merge pull request #1037 from quarkiverse/jlama-llama3java-ci

Update Llama3 and Jlama ITs in CI
quarkiverse · Nov 1, 2024 · afe026d · afe026d
2 parents 6420a5b + 9969c6c
commit afe026d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
@@ -124,19 +124,15 @@ jobs:
         run: |
           ./mvnw -B clean install -DskipTests -Dno-format -ntp -f model-providers/jlama/pom.xml
 
-      - name: Run tests of ${{ matrix.module }} with JDK ${{ matrix.java }}
-        run: |
-          cd ${{ matrix.module }} && ../mvnw -B verify -Dci=true -Dno-format -ntp
-
       # Build Llama3.java if JDK >= 22. See https://x.com/tjake/status/1849141171475399083?t=EpgVJCPLC17fCXio0FvnhA&s=19 for the reason
       - name: Build Llama3-java extension
         if: ${{ matrix.java >= 22 }}
         run: |
-          ./mvnw -B clean install -DskipTests -Dno-format -ntp -f model-providers/llama3-java/pom.xml
+          ./mvnw -B clean install -DskipTests -Dno-format -ntp -f model-providers/llama3-java/pom.xml           
 
       - name: Run tests of ${{ matrix.module }} with JDK ${{ matrix.java }}
         run: |
-          cd ${{ matrix.module }} && ../mvnw -B verify -Dci=true -Dno-format -ntp              
+          cd ${{ matrix.module }} && ../mvnw -B verify -Dci=true -Dno-format -ntp         
 
 
   native-tests:

diff --git a/integration-tests/jlama/pom.xml b/integration-tests/jlama/pom.xml
@@ -134,17 +134,5 @@
                 <quarkus.package.type>native</quarkus.package.type>
             </properties>
         </profile>
-        <profile>
-            <id>release</id>
-            <activation>
-                <property>
-                    <name>prepareRelease</name>
-                </property>
-            </activation>
-            <properties>
-                <!-- when a release is performed, we don't want to spend time downloading the models -->
-                <quarkus.langchain4j.jlama.include-models-in-artifact>false</quarkus.langchain4j.jlama.include-models-in-artifact>
-            </properties>
-        </profile>
     </profiles>
 </project>
diff --git a/integration-tests/jlama/src/main/resources/application.properties b/integration-tests/jlama/src/main/resources/application.properties
@@ -0,0 +1 @@
+quarkus.langchain4j.jlama.include-models-in-artifact=false
diff --git a/integration-tests/llama3-java/pom.xml b/integration-tests/llama3-java/pom.xml
@@ -6,8 +6,8 @@
         <artifactId>quarkus-langchain4j-integration-tests-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
-    <artifactId>quarkus-langchain4j-integration-test-jlama</artifactId>
-    <name>Quarkus LangChain4j - Integration Tests - Jlama</name>
+    <artifactId>quarkus-langchain4j-integration-test-llama3-java</artifactId>
+    <name>Quarkus LangChain4j - Integration Tests - Llama3 Java</name>
     <properties>
         <skipITs>true</skipITs>
         <maven.compiler.release>21</maven.compiler.release>

diff --git a/integration-tests/llama3-java/src/main/resources/application.properties b/integration-tests/llama3-java/src/main/resources/application.properties
@@ -0,0 +1 @@
+quarkus.langchain4j.llama3.include-models-in-artifact=false
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -38,5 +38,14 @@
         <module>jlama</module>
       </modules>
     </profile>
+    <profile>
+      <id>jdk22-plus</id>
+      <activation>
+        <jdk>[22,)</jdk>
+      </activation>
+      <modules>
+        <module>llama3-java</module>
+      </modules>
+    </profile>
   </profiles>
 </project>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		quarkus.langchain4j.jlama.include-models-in-artifact=false
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		quarkus.langchain4j.llama3.include-models-in-artifact=false