From dd0d9f6d196edf2e577d81f19178f3ae3eb789c8 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 3 Oct 2024 13:38:10 -0600 Subject: [PATCH] Eliminate workaround for action cleanup failure --- .github/actions/do-autoconfigure-test/action.yml | 8 +++----- .github/actions/do-integration-test/action.yml | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/actions/do-autoconfigure-test/action.yml b/.github/actions/do-autoconfigure-test/action.yml index 6e1ca20..d6e5707 100644 --- a/.github/actions/do-autoconfigure-test/action.yml +++ b/.github/actions/do-autoconfigure-test/action.yml @@ -18,6 +18,7 @@ runs: with: repository: spring-projects/spring-ai ref: refs/heads/main + path: spring-ai - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -28,11 +29,8 @@ runs: - name: Install shell: bash - run: ./mvnw install -DskipTests + run: cd spring-ai && ./mvnw install -DskipTests - name: Run Spring AI Autoconfigure test shell: bash - run: ./mvnw -pl spring-ai-spring-boot-autoconfigure -Pintegration-tests -Dfailsafe.rerunFailingTestsCount=2 verify - - - name: workaround - checkout the action again - uses: actions/checkout@v4 + run: cd spring-ai && ./mvnw -pl spring-ai-spring-boot-autoconfigure -Pintegration-tests -Dfailsafe.rerunFailingTestsCount=2 verify diff --git a/.github/actions/do-integration-test/action.yml b/.github/actions/do-integration-test/action.yml index f049239..248d7ec 100644 --- a/.github/actions/do-integration-test/action.yml +++ b/.github/actions/do-integration-test/action.yml @@ -23,6 +23,7 @@ runs: with: repository: spring-projects/spring-ai ref: refs/heads/main + path: spring-ai - name: Set up JDK 17 uses: actions/setup-java@v4 @@ -33,11 +34,8 @@ runs: - name: Install shell: bash - run: ./mvnw install -DskipTests + run: cd spring-ai && ./mvnw install -DskipTests - name: Run ${{ inputs.model-name }} model tests shell: bash - run: ./mvnw -pl models/spring-ai-${{ inputs.model-name }} -Pintegration-tests -Dfailsafe.rerunFailingTestsCount=2 verify - - - name: workaround - checkout the action again - uses: actions/checkout@v4 + run: cd spring-ai && ./mvnw -pl models/spring-ai-${{ inputs.model-name }} -Pintegration-tests -Dfailsafe.rerunFailingTestsCount=2 verify