Spring/spring-ai
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CI Actions imporvements

Browse Source
This commit is contained in:
Mark Pollack
2024-11-12 15:24:23 -05:00
parent 6acd202c12
commit 1d540a6dd1
6 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
.github/workflows/continuous-integration.yml vendored
View File

@@ -40,10 +40,10 @@ jobs:
SPRING_AI_OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
OLLAMA_TESTS_ENABLED: "false"
OLLAMA_AUTOCONF_TESTS_ENABLED: "true"
run: |
mvn -s settings.xml -Pintegration-tests -Pjavadoc -Dfailsafe.rerunFailingTestsCount=3 \
-DOLLAMA_TESTS_ENABLED=false --batch-mode --update-snapshots deploy
--batch-mode --update-snapshots deploy
- name: Generate Java docs
run: mvn javadoc:aggregate
@@ -78,33 +78,28 @@ jobs:
# The docker-compose and testcontainers modules will be compiled and run in a parallel job
# container-tests:
# name: Container integration tests
# runs-on: ubuntu-latest
# steps:
# - name: Checkout source code
# uses: actions/checkout@v4
#
# - name: Set up JDK 17
# uses: actions/setup-java@v4
# with:
# java-version: '17'
# distribution: 'temurin'
# cache: 'maven'
#
# - name: Configure Testcontainers
# run: |
# echo "testcontainers.reuse.enable=true" > $HOME/.testcontainers.properties
#
# - name: Run Container Integration Tests
# env:
# OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
# SPRING_AI_OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
# ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
# ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
# run: |
# mvn -s settings.xml -Pintegration-tests verify \
# -Dskip.docker-compose=false \
# -Dskip.testcontainers=false \
# -pl spring-ai-spring-boot-docker-compose,spring-ai-spring-boot-testcontainers \
# -am --batch-mode
container-tests:
name: docker-compose and testcontainers modules
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: 'maven'
- name: Configure Testcontainers
run: |
echo "testcontainers.reuse.enable=true" > $HOME/.testcontainers.properties
- name: Run Container Integration Tests
run: |
mvn -s settings.xml -Pintegration-tests verify \
-Dskip.docker-compose=false \
-Dskip.testcontainers=false \
-pl spring-ai-spring-boot-docker-compose,spring-ai-spring-boot-testcontainers \
-am --batch-mode