From 9192b04dc8e986f46eccda06cf92ab98d8a2c895 Mon Sep 17 00:00:00 2001 From: Leon Luithlen Date: Mon, 11 Nov 2024 14:55:50 +0100 Subject: [PATCH] Change to AND operator and move from concurrency to run --- .github/workflows/test_neo4j.yml | 2 +- .github/workflows/test_notebook.yml | 2 +- .github/workflows/test_pgvector.yml | 2 +- .github/workflows/test_python_3_10.yml | 4 ++-- .github/workflows/test_python_3_11.yml | 4 ++-- .github/workflows/test_python_3_9.yml | 4 ++-- .github/workflows/test_qdrant.yml | 2 +- .github/workflows/test_weaviate.yml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test_neo4j.yml b/.github/workflows/test_neo4j.yml index 55b0f4ee4..5e94ad7f5 100644 --- a/.github/workflows/test_neo4j.yml +++ b/.github/workflows/test_neo4j.yml @@ -22,7 +22,7 @@ jobs: run_neo4j_integration_test: name: test needs: get_docs_changes - if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' | ${{ github.event.label.name == 'run-checks' }} + if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' && ${{ github.event.label.name == 'run-checks' }} runs-on: ubuntu-latest defaults: diff --git a/.github/workflows/test_notebook.yml b/.github/workflows/test_notebook.yml index 20f51a6e2..49365ac95 100644 --- a/.github/workflows/test_notebook.yml +++ b/.github/workflows/test_notebook.yml @@ -23,7 +23,7 @@ jobs: run_notebook_test: name: test needs: get_docs_changes - if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' | ${{ github.event.label.name == 'run-checks' }} + if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' && ${{ github.event.label.name == 'run-checks' }} runs-on: ubuntu-latest defaults: run: diff --git a/.github/workflows/test_pgvector.yml b/.github/workflows/test_pgvector.yml index c9dfc2c35..971208fb3 100644 --- a/.github/workflows/test_pgvector.yml +++ b/.github/workflows/test_pgvector.yml @@ -23,7 +23,7 @@ jobs: run_pgvector_integration_test: name: test needs: get_docs_changes - if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' | ${{ github.event.label.name == 'run-checks' }} + if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' && ${{ github.event.label.name == 'run-checks' }} runs-on: ubuntu-latest defaults: run: diff --git a/.github/workflows/test_python_3_10.yml b/.github/workflows/test_python_3_10.yml index 03186ac2d..625d472e5 100644 --- a/.github/workflows/test_python_3_10.yml +++ b/.github/workflows/test_python_3_10.yml @@ -8,7 +8,7 @@ on: types: [labeled] concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} | ${{ github.event.label.name == 'run-checks' }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true env: @@ -22,7 +22,7 @@ jobs: run_common: name: test needs: get_docs_changes - if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' + if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' && ${{ github.event.label.name == 'run-checks' }} runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/.github/workflows/test_python_3_11.yml b/.github/workflows/test_python_3_11.yml index fb2c66072..4ff6a9cee 100644 --- a/.github/workflows/test_python_3_11.yml +++ b/.github/workflows/test_python_3_11.yml @@ -8,7 +8,7 @@ on: types: [labeled] concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} | ${{ github.event.label.name == 'run-checks' }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true env: @@ -22,7 +22,7 @@ jobs: run_common: name: test needs: get_docs_changes - if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' + if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' && ${{ github.event.label.name == 'run-checks' }} runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/.github/workflows/test_python_3_9.yml b/.github/workflows/test_python_3_9.yml index 1c7f72840..fae865a1d 100644 --- a/.github/workflows/test_python_3_9.yml +++ b/.github/workflows/test_python_3_9.yml @@ -8,7 +8,7 @@ on: types: [labeled] concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} | ${{ github.event.label.name == 'run-checks' }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true env: @@ -22,7 +22,7 @@ jobs: run_common: name: test needs: get_docs_changes - if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' + if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' && ${{ github.event.label.name == 'run-checks' }} runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/.github/workflows/test_qdrant.yml b/.github/workflows/test_qdrant.yml index 595325672..4a7bdc6af 100644 --- a/.github/workflows/test_qdrant.yml +++ b/.github/workflows/test_qdrant.yml @@ -23,7 +23,7 @@ jobs: run_qdrant_integration_test: name: test needs: get_docs_changes - if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' | ${{ github.event.label.name == 'run-checks' }} + if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' && ${{ github.event.label.name == 'run-checks' }} runs-on: ubuntu-latest defaults: diff --git a/.github/workflows/test_weaviate.yml b/.github/workflows/test_weaviate.yml index 9353d1747..0199ad016 100644 --- a/.github/workflows/test_weaviate.yml +++ b/.github/workflows/test_weaviate.yml @@ -23,7 +23,7 @@ jobs: run_weaviate_integration_test: name: test needs: get_docs_changes - if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' | ${{ github.event.label.name == 'run-checks' }} + if: needs.get_docs_changes.outputs.changes_outside_docs == 'true' && ${{ github.event.label.name == 'run-checks' }} runs-on: ubuntu-latest defaults: