Update workflow

spring-projects · Oct 1, 2024 · 65e88c9 · 65e88c9
1 parent 52c99dc
commit 65e88c9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/spring-ai-integration-tests-manual-only.yml b/.github/workflows/spring-ai-integration-tests-manual-only.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   test-minimax:
-    env: &MINIMAX_ENV
+    env:
       MINIMAX_API_KEY: ${{ secrets.MINIMAX_API_KEY }}
     runs-on: ubuntu-latest
     steps:
@@ -34,7 +34,7 @@ jobs:
         run: ./mvnw -pl models/spring-ai-minimax -Pintegration-tests -Dfailsafe.rerunFailingTestsCount=2 verify
 
   test-moonshot:
-    env: &MOONSHOT_ENV
+    env:
       MOONSHOT_API_KEY: ${{ secrets.MOONSHOT_API_KEY }}
     runs-on: ubuntu-latest
     steps:
@@ -63,7 +63,7 @@ jobs:
         run: ./mvnw -pl models/spring-ai-moonshot -Pintegration-tests -Dfailsafe.rerunFailingTestsCount=2 verify
 
   test-qianfan:
-    env: &QIANFAN_ENV
+    env:
       QIANFAN_API_KEY: ${{ secrets.QIANFAN_API_KEY }}
       QIANFAN_SECRET_KEY: ${{ secrets.QIANFAN_SECRET_KEY }}
     runs-on: ubuntu-latest
@@ -93,7 +93,7 @@ jobs:
         run: ./mvnw -pl models/spring-ai-qianfan -Pintegration-tests -Dfailsafe.rerunFailingTestsCount=2 verify
 
   test-zhipu-ai:
-    env: &ZHIPU_AI_ENV
+    env:
       ZHIPU_API_KEY: ${{ secrets.ZHIPU_API_KEY }}
     runs-on: ubuntu-latest
     steps:
@@ -123,10 +123,11 @@ jobs:
 
   test-autoconfigure:
     env:
-      <<: *MINIMAX_ENV
-      <<: *MOONSHOT_ENV
-      <<: *QIANFAN_ENV
-      <<: *ZHIPU_AI_ENV
+      MINIMAX_API_KEY: ${{ secrets.MINIMAX_API_KEY }}
+      MOONSHOT_API_KEY: ${{ secrets.MOONSHOT_API_KEY }}
+      QIANFAN_API_KEY: ${{ secrets.QIANFAN_API_KEY }}
+      QIANFAN_SECRET_KEY: ${{ secrets.QIANFAN_SECRET_KEY }}
+      ZHIPU_API_KEY: ${{ secrets.ZHIPU_API_KEY }}
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4

diff --git a/.github/workflows/spring-ai-integration-tests.yml b/.github/workflows/spring-ai-integration-tests.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   test-azure:
-    env: &AZURE_OPENAI_ENV
+    env:
       AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
       AZURE_OPENAI_ENDPOINT: ${{ secrets.AZURE_OPENAI_ENDPOINT }}
     runs-on: ubuntu-latest
@@ -37,7 +37,7 @@ jobs:
 
   test-bedrock:
     runs-on: ubuntu-latest
-    env: &BEDROCK_ENV
+    env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     steps:
@@ -67,8 +67,10 @@ jobs:
 
   test-autoconfigure:
     env:
-      <<: *AZURE_OPENAI_ENV
-      <<: *BEDROCK_ENV
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
+      AZURE_OPENAI_ENDPOINT: ${{ secrets.AZURE_OPENAI_ENDPOINT }}
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4