Copy over GHA action workflow changes over from main to 1.x

msmygit · msmygit · commit 8f63f34526d9 · 2024-11-08T09:19:42.000-05:00
diff --git a/.github/actions/checkout-and-build/action.yml b/.github/actions/checkout-and-build/action.yml
@@ -31,5 +31,6 @@ runs:
         cache: ${{ inputs.cache_pkg_mgr_name}}
 
     - name: Build with Maven
+      shell: bash
       run: |
         mvn install -Dmaven.test.skip=${{ inputs.skip_tests_on_build }}
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "monthly"
diff --git a/.github/workflows/ci-astra-col-db-dbadmin.yaml b/.github/workflows/ci-astra-col-db-dbadmin.yaml
@@ -11,6 +11,7 @@ on:
         description: 'JDK distribution to use'
         required: true
         default: 'adopt'
+        type: choice
         options: ['adopt', 'temurin']
       java_version:
         description: 'JDK version to use'
@@ -28,6 +29,7 @@ on:
         description: 'Test to run'
         required: true
         default: 'AstraDevCollectionITTest'
+        type: choice
         options:
           - 'AstraDevCollectionITTest'
           - 'AstraDevDatabaseITTest'
@@ -40,6 +42,8 @@ jobs:
   BUILD:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
       - name: Checkout & Build
         uses: ./.github/actions/checkout-and-build
 
diff --git a/.github/workflows/ci-astra-dev-new.yml b/.github/workflows/ci-astra-dev-new.yml
@@ -12,6 +12,7 @@ on:
         description: 'JDK distribution to use'
         required: true
         default: 'adopt'
+        type: choice
         options: ['adopt', 'temurin']
       java_version:
         description: 'JDK version to use'
@@ -27,14 +28,16 @@ on:
         default: 'true'
 
 jobs:
-  setup:
+  BUILD:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
       - name: Checkout & Build
         uses: ./.github/actions/checkout-and-build
 
   run_dev_tests:
-    needs: setup
+    needs: BUILD
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -74,23 +77,22 @@ jobs:
             cloud_region: us-west-2
           - cloud_provider: GCP
             cloud_region: europe-west4
-        embedding_provider: 
-          - name: openai
-            key: ${{ secrets.OPENAI_API_KEY }}
-          - name: azureOpenAI
-            key: ${{ secrets.AZURE_OPENAI_API_KEY }}
-          - name: huggingface
-            key: ${{ secrets.HF_API_KEY }}
-          - name: mistral
-            key: ${{ secrets.MISTRAL_API_KEY }}
-          - name: voyageAI
-            key: ${{ secrets.VOYAGE_API_KEY }}
-          - name: upstageAI
-            key: ${{ secrets.UPSTAGE_API_KEY }}
-          - name: jinaAI
-            key: ${{ secrets.JINA_API_KEY }}
-          - name: nvidia
-            key: 'nvidia' # Not used
+          - embedding_provider: openai
+            key_name: OPENAI_API_KEY
+          - embedding_provider: azureOpenAI
+            key_name: AZURE_OPENAI_API_KEY
+          - embedding_provider: huggingface
+            key_name: HF_API_KEY
+          - embedding_provider: mistral
+            key_name: MISTRAL_API_KEY
+          - embedding_provider: voyageAI
+            key_name: VOYAGE_API_KEY
+          - embedding_provider: upstageAI
+            key_name: UPSTAGE_API_KEY
+          - embedding_provider: jinaAI
+            key_name: JINA_API_KEY
+          - embedding_provider: nvidia
+            key_name: 'nvidia' # Not used
 
     steps:
       - name: Checkout repository
@@ -107,8 +109,8 @@ jobs:
           ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }}
           ASTRA_CLOUD_PROVIDER_DEV: ${{ matrix.cloud_provider }}
           ASTRA_CLOUD_REGION_DEV: ${{ matrix.cloud_region }}
-          EMBEDDING_PROVIDER: ${{ matrix.embedding_provider.name }}
-          EMBEDDING_API_KEY: ${{ matrix.embedding_provider.key }}
+          EMBEDDING_PROVIDER: ${{ matrix.embedding_provider }}
+          EMBEDDING_API_KEY: ${{ secrets[matrix.key_name] }}
         run: |
           cd astra-db-java
           mvn test -Dtest=com.datastax.astra.test.integration.dev_vectorize.AstraDevVectorizeEmbeddingApiKeyITTest
diff --git a/.github/workflows/ci-astra-devops.yaml b/.github/workflows/ci-astra-devops.yaml
@@ -29,6 +29,8 @@ jobs:
   BUILD:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
       - name: Checkout & Build
         uses: ./.github/actions/checkout-and-build
   run_dev_tests:
diff --git a/.github/workflows/ci-astra-vectorize-bedrock-hf.yaml b/.github/workflows/ci-astra-vectorize-bedrock-hf.yaml
@@ -11,13 +11,15 @@ on:
         description: 'Embedding provider for tests to run'
         required: true
         default: 'bedrock'
+        type: choice
         options:
           - 'bedrock'
           - 'huggingfaceDedicated'
       java_distribution:
         description: 'JDK distribution to use'
         required: true
         default: 'adopt'
+        type: choice
         options: ['adopt', 'temurin']
       java_version:
         description: 'JDK version to use'
@@ -36,6 +38,8 @@ jobs:
   BUILD:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
       - name: Checkout & Build
         uses: ./.github/actions/checkout-and-build
 
diff --git a/pom.xml b/pom.xml
@@ -339,6 +339,12 @@
             <email>cedrick.lunven@gmail.com</email>
             <url>https://github.com/clun</url>
         </developer>
+        <developer>
+            <id>msmygit</id>
+            <name>Madhavan Sridharan</name>
+            <email>madhavan_5k@yahoo.com</email>
+            <url>https://github.com/msmygit</url>
+        </developer>
     </developers>
 
     <profiles>
