Skip to content

Commit 4361abc

Browse files
authored
Merge pull request #21 from datastax/ms/gha_improvements
GHA workflow improvements
2 parents 47ddaa1 + 21723cd commit 4361abc

File tree

6 files changed

+42
-21
lines changed

6 files changed

+42
-21
lines changed

.github/actions/checkout-and-build/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@ runs:
3131
cache: ${{ inputs.cache_pkg_mgr_name}}
3232

3333
- name: Build with Maven
34+
shell: bash
3435
run: |
3536
mvn install -Dmaven.test.skip=${{ inputs.skip_tests_on_build }}

.github/dependabot.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Set update schedule for GitHub Actions
2+
3+
version: 2
4+
updates:
5+
- package-ecosystem: "github-actions"
6+
directory: "/"
7+
schedule:
8+
interval: "monthly"
9+
10+
- package-ecosystem: "docker"
11+
directory: "/"
12+
schedule:
13+
interval: "monthly"

.github/workflows/ci-astra-col-db-dbadmin.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ jobs:
4040
BUILD:
4141
runs-on: ubuntu-latest
4242
steps:
43+
- name: Checkout repository
44+
uses: actions/checkout@v4
4345
- name: Checkout & Build
4446
uses: ./.github/actions/checkout-and-build
4547

.github/workflows/ci-astra-dev-new.yml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,16 @@ on:
2727
default: 'true'
2828

2929
jobs:
30-
setup:
30+
BUILD:
3131
runs-on: ubuntu-latest
3232
steps:
33+
- name: Checkout repository
34+
uses: actions/checkout@v4
3335
- name: Checkout & Build
3436
uses: ./.github/actions/checkout-and-build
3537

3638
run_dev_tests:
37-
needs: setup
39+
needs: BUILD
3840
runs-on: ubuntu-latest
3941
strategy:
4042
matrix:
@@ -74,23 +76,22 @@ jobs:
7476
cloud_region: us-west-2
7577
- cloud_provider: GCP
7678
cloud_region: europe-west4
77-
embedding_provider:
78-
- name: openai
79-
key: ${{ secrets.OPENAI_API_KEY }}
80-
- name: azureOpenAI
81-
key: ${{ secrets.AZURE_OPENAI_API_KEY }}
82-
- name: huggingface
83-
key: ${{ secrets.HF_API_KEY }}
84-
- name: mistral
85-
key: ${{ secrets.MISTRAL_API_KEY }}
86-
- name: voyageAI
87-
key: ${{ secrets.VOYAGE_API_KEY }}
88-
- name: upstageAI
89-
key: ${{ secrets.UPSTAGE_API_KEY }}
90-
- name: jinaAI
91-
key: ${{ secrets.JINA_API_KEY }}
92-
- name: nvidia
93-
key: 'nvidia' # Not used
79+
- embedding_provider: openai
80+
key_name: OPENAI_API_KEY
81+
- embedding_provider: azureOpenAI
82+
key_name: AZURE_OPENAI_API_KEY
83+
- embedding_provider: huggingface
84+
key_name: HF_API_KEY
85+
- embedding_provider: mistral
86+
key_name: MISTRAL_API_KEY
87+
- embedding_provider: voyageAI
88+
key_name: VOYAGE_API_KEY
89+
- embedding_provider: upstageAI
90+
key_name: UPSTAGE_API_KEY
91+
- embedding_provider: jinaAI
92+
key_name: JINA_API_KEY
93+
- embedding_provider: nvidia
94+
key_name: 'nvidia' # Not used
9495

9596
steps:
9697
- name: Checkout repository
@@ -107,8 +108,8 @@ jobs:
107108
ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }}
108109
ASTRA_CLOUD_PROVIDER_DEV: ${{ matrix.cloud_provider }}
109110
ASTRA_CLOUD_REGION_DEV: ${{ matrix.cloud_region }}
110-
EMBEDDING_PROVIDER: ${{ matrix.embedding_provider.name }}
111-
EMBEDDING_API_KEY: ${{ matrix.embedding_provider.key }}
111+
EMBEDDING_PROVIDER: ${{ matrix.embedding_provider }}
112+
EMBEDDING_API_KEY: ${{ secrets[matrix.key_name] }}
112113
run: |
113114
cd astra-db-java
114115
mvn test -Dtest=com.datastax.astra.test.integration.dev_vectorize.AstraDevVectorizeEmbeddingApiKeyITTest

.github/workflows/ci-astra-devops.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
BUILD:
3030
runs-on: ubuntu-latest
3131
steps:
32+
- name: Checkout repository
33+
uses: actions/checkout@v4
3234
- name: Checkout & Build
3335
uses: ./.github/actions/checkout-and-build
3436
run_dev_tests:

.github/workflows/ci-astra-vectorize-bedrock-hf.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ jobs:
3636
BUILD:
3737
runs-on: ubuntu-latest
3838
steps:
39+
- name: Checkout repository
40+
uses: actions/checkout@v4
3941
- name: Checkout & Build
4042
uses: ./.github/actions/checkout-and-build
4143

0 commit comments

Comments
 (0)