From 1fbdbffed346d7bd218528dd4f919155a1153fe1 Mon Sep 17 00:00:00 2001 From: Andrew Brookins Date: Mon, 31 Mar 2025 12:34:57 -0700 Subject: [PATCH 1/3] WIP on running a single pass through service tests --- .github/workflows/test.yml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f96fca62..ee6aa358 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,8 +17,8 @@ env: POETRY_VERSION: "1.8.3" jobs: - prime-cache: - name: Prime HuggingFace Model Cache + service-tests: + name: Service Tests runs-on: ubuntu-latest env: HF_HOME: ${{ github.workspace }}/hf_cache @@ -38,10 +38,10 @@ jobs: mkdir -p ~/.huggingface echo '{"token":"${{ secrets.HF_TOKEN }}"}' > ~/.huggingface/token - - name: Set up Python 3.9 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.11 cache: pip - name: Install Poetry @@ -86,7 +86,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.10", "3.11", 3.12, 3.13] + # 3.11 tests are run in the service-tests job + python-version: ["3.9", "3.10", 3.12, 3.13] connection: ["hiredis", "plain"] redis-version: ["6.2.6-v9", "latest", "8.0-M03"] @@ -137,20 +138,10 @@ jobs: if: matrix.connection == 'plain' && matrix.redis-version == 'latest' env: HF_HOME: ${{ github.workspace }}/hf_cache - OPENAI_API_KEY: ${{ secrets.OPENAI_KEY }} GCP_LOCATION: ${{ secrets.GCP_LOCATION }} GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }} - COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }} - MISTRAL_API_KEY: ${{ secrets.MISTRAL_API_KEY }} - VOYAGE_API_KEY: ${{ secrets.VOYAGE_API_KEY }} - AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }} - AZURE_OPENAI_ENDPOINT: ${{ secrets.AZURE_OPENAI_ENDPOINT }} - AZURE_OPENAI_DEPLOYMENT_NAME: ${{ secrets.AZURE_OPENAI_DEPLOYMENT_NAME }} - OPENAI_API_VERSION: ${{ secrets.OPENAI_API_VERSION }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} run: | - make test-all + make test - name: Run tests (alternate) if: matrix.connection != 'plain' || matrix.redis-version != 'latest' From 3acb3d344bde3efc9e7ed8780a6d1c6b81c5089d Mon Sep 17 00:00:00 2001 From: Andrew Brookins Date: Mon, 31 Mar 2025 13:24:37 -0700 Subject: [PATCH 2/3] fix workflow yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d2f8929d..f97cb7d8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -58,7 +58,7 @@ jobs: with: credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }} - - name: Run full test suite to prime cache + - name: Run full test suite and prime the HF cache env: HF_TOKEN: ${{ secrets.HF_TOKEN }} HF_HOME: ${{ github.workspace }}/hf_cache @@ -80,7 +80,7 @@ jobs: test: name: Python ${{ matrix.python-version }} - ${{ matrix.connection }} [redis ${{ matrix.redis-version }}] runs-on: ubuntu-latest - needs: prime-cache + needs: service-tests env: HF_HOME: ${{ github.workspace }}/hf_cache strategy: From 373d1d24e6698fa393c4b7bd38aac2e5ec19c3da Mon Sep 17 00:00:00 2001 From: Andrew Brookins Date: Mon, 31 Mar 2025 13:39:36 -0700 Subject: [PATCH 3/3] Fix merge issue --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f97cb7d8..b2747769 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -167,7 +167,6 @@ jobs: HF_TOKEN: ${{ secrets.HF_TOKEN }} run: | docker run -d --name redis -p 6379:6379 redis/redis-stack-server:latest - make test-notebooks if [[ "${{ matrix.python-version }}" > "3.9" ]]; then make test-notebooks else