From 573b0a27f3f3666209f2369920512d4adf62ede0 Mon Sep 17 00:00:00 2001 From: samsja Date: Thu, 4 May 2023 17:07:12 +0200 Subject: [PATCH 01/20] chore: add seperate jac ci Signed-off-by: samsja --- .github/workflows/ci.yml | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea673567d77..d10a0417be8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,7 +108,7 @@ jobs: - name: Test id: test run: | - poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} + poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py timeout-minutes: 30 env: JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" @@ -127,6 +127,36 @@ jobs: # token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos + docarray-test-jac: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install elasticsearch==8.6.2 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m "not (tensorflow or benchmark or index)" tests/integrations/store/test_jac.py + timeout-minutes: 30 + env: + JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" + docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing needs: [lint-ruff, check-black, import-test] @@ -155,7 +185,7 @@ jobs: - name: Test id: test run: | - poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} + poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py timeout-minutes: 30 env: JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" From a88db09b18ad9d751fd1bd84537df332b6e3a3be Mon Sep 17 00:00:00 2001 From: samsja Date: Thu, 4 May 2023 17:42:05 +0200 Subject: [PATCH 02/20] chore: pass env stuff Signed-off-by: samsja --- .github/workflows/cd.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 07c4525d090..611b58baa2f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -5,10 +5,15 @@ on: branches: - main - chore-fix-prerelease + - chore-ci-fix-jac jobs: success-all-test: uses: ./.github/workflows/ci.yml + with: + env: + JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" + prerelease: needs: [success-all-test] runs-on: ubuntu-latest From 30e35500c160b10d65a7559e00cb41ad9b3ef2ea Mon Sep 17 00:00:00 2001 From: samsja Date: Thu, 4 May 2023 17:43:17 +0200 Subject: [PATCH 03/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d10a0417be8..893ddb935d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,8 +5,8 @@ on: inputs: config-path: type: string - pull_request: - types: [opened, synchronize, reopened] +# pull_request: +# types: [opened, synchronize, reopened] jobs: From e82de4b69e662667e5d6c8b7ceca5a6830bcbdf8 Mon Sep 17 00:00:00 2001 From: samsja Date: Thu, 4 May 2023 18:00:40 +0200 Subject: [PATCH 04/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/cd.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 611b58baa2f..86d4af25b83 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -5,7 +5,8 @@ on: branches: - main - chore-fix-prerelease - - chore-ci-fix-jac + pull_request: + types: [opened, synchronize, reopened] jobs: success-all-test: From 9eeffc3264527d047ea7148ca9f5c56b04c686c6 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:04:16 +0200 Subject: [PATCH 05/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/cd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 86d4af25b83..113a02369bd 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -11,9 +11,9 @@ on: jobs: success-all-test: uses: ./.github/workflows/ci.yml - with: - env: - JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" +# with: +# env: +# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" prerelease: needs: [success-all-test] From b4828ab4a3b5ba6cce540723585cd70683199874 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:08:31 +0200 Subject: [PATCH 06/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/cd.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 113a02369bd..636e1884ad9 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -8,6 +8,8 @@ on: pull_request: types: [opened, synchronize, reopened] +env: + JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" jobs: success-all-test: uses: ./.github/workflows/ci.yml From b87b3486fbaa4b64fa4f39f152a81b516c3a56a4 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:30:57 +0200 Subject: [PATCH 07/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/cd.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 636e1884ad9..b667be0bba3 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -8,14 +8,11 @@ on: pull_request: types: [opened, synchronize, reopened] -env: - JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" jobs: success-all-test: uses: ./.github/workflows/ci.yml -# with: -# env: -# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" + env: + JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" prerelease: needs: [success-all-test] From 666af60f7f984844f6ee98dcf684cde5c24395d0 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:31:38 +0200 Subject: [PATCH 08/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/ci.yml | 582 +++++++++++++++++++-------------------- 1 file changed, 291 insertions(+), 291 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 893ddb935d0..9977869261e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,120 +11,120 @@ on: jobs: - lint-ruff: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: Lint with ruff - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install - - # stop the build if there are Python syntax errors or undefined names - poetry run ruff docarray - # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - poetry run ruff docarray - - check-black: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: check black - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --only dev - poetry run black --check . - - env: - CHANGED_FILES: ${{ steps.file_changes.outputs.added_modified }} - - import-test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --without dev - poetry run pip install tensorflow==2.11.0 - - name: Test basic import - run: poetry run python -c 'from docarray import DocList, BaseDoc' - - - check-mypy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: check mypy - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run mypy docarray - - - docarray-test: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - test-path: [tests/integrations, tests/units, tests/documentation] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install elasticsearch==8.6.2 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py - timeout-minutes: 30 - env: - JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" -# - name: Check codecov file -# id: check_files -# uses: andstor/file-existence-action@v1 +# lint-ruff: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python 3.7 +# uses: actions/setup-python@v4 +# with: +# python-version: 3.7 +# - name: Lint with ruff +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install +# +# # stop the build if there are Python syntax errors or undefined names +# poetry run ruff docarray +# # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide +# poetry run ruff docarray +# +# check-black: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python 3.7 +# uses: actions/setup-python@v4 +# with: +# python-version: 3.7 +# - name: check black +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --only dev +# poetry run black --check . +# +# env: +# CHANGED_FILES: ${{ steps.file_changes.outputs.added_modified }} +# +# import-test: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python 3.7 +# uses: actions/setup-python@v4 # with: -# files: "coverage.xml" -# - name: Upload coverage from test to Codecov -# uses: codecov/codecov-action@v3.1.1 -# if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' +# python-version: 3.7 +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --without dev +# poetry run pip install tensorflow==2.11.0 +# - name: Test basic import +# run: poetry run python -c 'from docarray import DocList, BaseDoc' +# +# +# check-mypy: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python 3.7 +# uses: actions/setup-python@v4 # with: -# file: coverage.xml -# flags: ${{ steps.test.outputs.codecov_flag }} -# fail_ci_if_error: false -# token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos +# python-version: 3.7 +# - name: check mypy +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run mypy docarray +# +# +# docarray-test: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# test-path: [tests/integrations, tests/units, tests/documentation] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install elasticsearch==8.6.2 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py +# timeout-minutes: 30 +# env: +# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" +## - name: Check codecov file +## id: check_files +## uses: andstor/file-existence-action@v1 +## with: +## files: "coverage.xml" +## - name: Upload coverage from test to Codecov +## uses: codecov/codecov-action@v3.1.1 +## if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' +## with: +## file: coverage.xml +## flags: ${{ steps.test.outputs.codecov_flag }} +## fail_ci_if_error: false +## token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos docarray-test-jac: @@ -156,188 +156,188 @@ jobs: timeout-minutes: 30 env: JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" - - - docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - test-path: [tests/integrations, tests/units, tests/documentation] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - rm poetry.lock - poetry install --all-extras - poetry run pip install elasticsearch==8.6.2 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py - timeout-minutes: 30 - env: - JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" - - - docarray-test-proto3: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install protobuf==3.19.0 # we check that we support 3.19 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m 'proto' tests - timeout-minutes: 30 - - - docarray-doc-index: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install protobuf==3.19.0 - poetry run pip install tensorflow==2.11.0 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }} - timeout-minutes: 30 - - - docarray-elastic-v8: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install protobuf==3.19.0 - poetry run pip install tensorflow==2.11.0 - poetry run pip install elasticsearch==8.6.2 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m 'index and elasticv8' tests - timeout-minutes: 30 - - docarray-test-tensorflow: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install protobuf==3.19.0 - poetry run pip install tensorflow==2.11.0 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m 'tensorflow' tests - timeout-minutes: 30 - - docarray-test-benchmarks: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - - - name: Test - id: test - run: | - poetry run pytest -m 'benchmark' tests - timeout-minutes: 30 +# +# +# docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# test-path: [tests/integrations, tests/units, tests/documentation] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# rm poetry.lock +# poetry install --all-extras +# poetry run pip install elasticsearch==8.6.2 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py +# timeout-minutes: 30 +# env: +# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" +# +# +# docarray-test-proto3: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install protobuf==3.19.0 # we check that we support 3.19 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'proto' tests +# timeout-minutes: 30 +# +# +# docarray-doc-index: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install protobuf==3.19.0 +# poetry run pip install tensorflow==2.11.0 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }} +# timeout-minutes: 30 +# +# +# docarray-elastic-v8: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install protobuf==3.19.0 +# poetry run pip install tensorflow==2.11.0 +# poetry run pip install elasticsearch==8.6.2 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'index and elasticv8' tests +# timeout-minutes: 30 +# +# docarray-test-tensorflow: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install protobuf==3.19.0 +# poetry run pip install tensorflow==2.11.0 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'tensorflow' tests +# timeout-minutes: 30 +# +# docarray-test-benchmarks: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'benchmark' tests +# timeout-minutes: 30 # just for blocking the merge until all parallel core-test are successful success-all-test: - needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] +# needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] if: always() runs-on: ubuntu-latest steps: From 3e9b7d1a4511b658a38d7970ee32337c90c27eb8 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:35:20 +0200 Subject: [PATCH 09/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/ci.yml | 582 +++++++++++++++++++-------------------- 1 file changed, 291 insertions(+), 291 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9977869261e..6c2a4b9e811 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,120 +11,120 @@ on: jobs: -# lint-ruff: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python 3.7 -# uses: actions/setup-python@v4 -# with: -# python-version: 3.7 -# - name: Lint with ruff -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install -# -# # stop the build if there are Python syntax errors or undefined names -# poetry run ruff docarray -# # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide -# poetry run ruff docarray -# -# check-black: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python 3.7 -# uses: actions/setup-python@v4 -# with: -# python-version: 3.7 -# - name: check black -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --only dev -# poetry run black --check . -# -# env: -# CHANGED_FILES: ${{ steps.file_changes.outputs.added_modified }} -# -# import-test: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python 3.7 -# uses: actions/setup-python@v4 -# with: -# python-version: 3.7 -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --without dev -# poetry run pip install tensorflow==2.11.0 -# - name: Test basic import -# run: poetry run python -c 'from docarray import DocList, BaseDoc' -# -# -# check-mypy: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python 3.7 -# uses: actions/setup-python@v4 + lint-ruff: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python 3.7 + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: Lint with ruff + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install + + # stop the build if there are Python syntax errors or undefined names + poetry run ruff docarray + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + poetry run ruff docarray + + check-black: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python 3.7 + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: check black + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --only dev + poetry run black --check . + + env: + CHANGED_FILES: ${{ steps.file_changes.outputs.added_modified }} + + import-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python 3.7 + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --without dev + poetry run pip install tensorflow==2.11.0 + - name: Test basic import + run: poetry run python -c 'from docarray import DocList, BaseDoc' + + + check-mypy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python 3.7 + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: check mypy + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run mypy docarray + + + docarray-test: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + test-path: [tests/integrations, tests/units, tests/documentation] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install elasticsearch==8.6.2 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py + timeout-minutes: 30 + env: + JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" +# - name: Check codecov file +# id: check_files +# uses: andstor/file-existence-action@v1 # with: -# python-version: 3.7 -# - name: check mypy -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run mypy docarray -# -# -# docarray-test: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# test-path: [tests/integrations, tests/units, tests/documentation] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 +# files: "coverage.xml" +# - name: Upload coverage from test to Codecov +# uses: codecov/codecov-action@v3.1.1 +# if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' # with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install elasticsearch==8.6.2 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py -# timeout-minutes: 30 -# env: -# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" -## - name: Check codecov file -## id: check_files -## uses: andstor/file-existence-action@v1 -## with: -## files: "coverage.xml" -## - name: Upload coverage from test to Codecov -## uses: codecov/codecov-action@v3.1.1 -## if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' -## with: -## file: coverage.xml -## flags: ${{ steps.test.outputs.codecov_flag }} -## fail_ci_if_error: false -## token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos +# file: coverage.xml +# flags: ${{ steps.test.outputs.codecov_flag }} +# fail_ci_if_error: false +# token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos docarray-test-jac: @@ -156,188 +156,188 @@ jobs: timeout-minutes: 30 env: JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" -# -# -# docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# test-path: [tests/integrations, tests/units, tests/documentation] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# rm poetry.lock -# poetry install --all-extras -# poetry run pip install elasticsearch==8.6.2 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py -# timeout-minutes: 30 -# env: -# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" -# -# -# docarray-test-proto3: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install protobuf==3.19.0 # we check that we support 3.19 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'proto' tests -# timeout-minutes: 30 -# -# -# docarray-doc-index: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install protobuf==3.19.0 -# poetry run pip install tensorflow==2.11.0 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }} -# timeout-minutes: 30 -# -# -# docarray-elastic-v8: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install protobuf==3.19.0 -# poetry run pip install tensorflow==2.11.0 -# poetry run pip install elasticsearch==8.6.2 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'index and elasticv8' tests -# timeout-minutes: 30 -# -# docarray-test-tensorflow: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install protobuf==3.19.0 -# poetry run pip install tensorflow==2.11.0 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'tensorflow' tests -# timeout-minutes: 30 -# -# docarray-test-benchmarks: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'benchmark' tests -# timeout-minutes: 30 + + + docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + test-path: [tests/integrations, tests/units, tests/documentation] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + rm poetry.lock + poetry install --all-extras + poetry run pip install elasticsearch==8.6.2 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py + timeout-minutes: 30 + env: + JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" + + + docarray-test-proto3: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install protobuf==3.19.0 # we check that we support 3.19 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'proto' tests + timeout-minutes: 30 + + + docarray-doc-index: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install protobuf==3.19.0 + poetry run pip install tensorflow==2.11.0 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }} + timeout-minutes: 30 + + + docarray-elastic-v8: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install protobuf==3.19.0 + poetry run pip install tensorflow==2.11.0 + poetry run pip install elasticsearch==8.6.2 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'index and elasticv8' tests + timeout-minutes: 30 + + docarray-test-tensorflow: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install protobuf==3.19.0 + poetry run pip install tensorflow==2.11.0 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'tensorflow' tests + timeout-minutes: 30 + + docarray-test-benchmarks: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + + - name: Test + id: test + run: | + poetry run pytest -m 'benchmark' tests + timeout-minutes: 30 # just for blocking the merge until all parallel core-test are successful success-all-test: -# needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] + needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] if: always() runs-on: ubuntu-latest steps: From 510eb64a85fe1404c53154396344db7f561191f6 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:37:01 +0200 Subject: [PATCH 10/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index b667be0bba3..e9307ca7ee5 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -11,8 +11,8 @@ on: jobs: success-all-test: uses: ./.github/workflows/ci.yml - env: - JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" +# env: +# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" prerelease: needs: [success-all-test] From e700efbf40be50b6e2e96dea21214b26155db1e0 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:37:23 +0200 Subject: [PATCH 11/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/ci.yml | 582 +++++++++++++++++++-------------------- 1 file changed, 291 insertions(+), 291 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c2a4b9e811..9977869261e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,120 +11,120 @@ on: jobs: - lint-ruff: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: Lint with ruff - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install - - # stop the build if there are Python syntax errors or undefined names - poetry run ruff docarray - # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - poetry run ruff docarray - - check-black: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: check black - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --only dev - poetry run black --check . - - env: - CHANGED_FILES: ${{ steps.file_changes.outputs.added_modified }} - - import-test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --without dev - poetry run pip install tensorflow==2.11.0 - - name: Test basic import - run: poetry run python -c 'from docarray import DocList, BaseDoc' - - - check-mypy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: check mypy - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run mypy docarray - - - docarray-test: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - test-path: [tests/integrations, tests/units, tests/documentation] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install elasticsearch==8.6.2 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py - timeout-minutes: 30 - env: - JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" -# - name: Check codecov file -# id: check_files -# uses: andstor/file-existence-action@v1 +# lint-ruff: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python 3.7 +# uses: actions/setup-python@v4 +# with: +# python-version: 3.7 +# - name: Lint with ruff +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install +# +# # stop the build if there are Python syntax errors or undefined names +# poetry run ruff docarray +# # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide +# poetry run ruff docarray +# +# check-black: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python 3.7 +# uses: actions/setup-python@v4 # with: -# files: "coverage.xml" -# - name: Upload coverage from test to Codecov -# uses: codecov/codecov-action@v3.1.1 -# if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' +# python-version: 3.7 +# - name: check black +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --only dev +# poetry run black --check . +# +# env: +# CHANGED_FILES: ${{ steps.file_changes.outputs.added_modified }} +# +# import-test: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python 3.7 +# uses: actions/setup-python@v4 # with: -# file: coverage.xml -# flags: ${{ steps.test.outputs.codecov_flag }} -# fail_ci_if_error: false -# token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos +# python-version: 3.7 +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --without dev +# poetry run pip install tensorflow==2.11.0 +# - name: Test basic import +# run: poetry run python -c 'from docarray import DocList, BaseDoc' +# +# +# check-mypy: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python 3.7 +# uses: actions/setup-python@v4 +# with: +# python-version: 3.7 +# - name: check mypy +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run mypy docarray +# +# +# docarray-test: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# test-path: [tests/integrations, tests/units, tests/documentation] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install elasticsearch==8.6.2 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py +# timeout-minutes: 30 +# env: +# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" +## - name: Check codecov file +## id: check_files +## uses: andstor/file-existence-action@v1 +## with: +## files: "coverage.xml" +## - name: Upload coverage from test to Codecov +## uses: codecov/codecov-action@v3.1.1 +## if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' +## with: +## file: coverage.xml +## flags: ${{ steps.test.outputs.codecov_flag }} +## fail_ci_if_error: false +## token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos docarray-test-jac: @@ -156,188 +156,188 @@ jobs: timeout-minutes: 30 env: JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" - - - docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - test-path: [tests/integrations, tests/units, tests/documentation] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - rm poetry.lock - poetry install --all-extras - poetry run pip install elasticsearch==8.6.2 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py - timeout-minutes: 30 - env: - JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" - - - docarray-test-proto3: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install protobuf==3.19.0 # we check that we support 3.19 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m 'proto' tests - timeout-minutes: 30 - - - docarray-doc-index: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install protobuf==3.19.0 - poetry run pip install tensorflow==2.11.0 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }} - timeout-minutes: 30 - - - docarray-elastic-v8: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install protobuf==3.19.0 - poetry run pip install tensorflow==2.11.0 - poetry run pip install elasticsearch==8.6.2 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m 'index and elasticv8' tests - timeout-minutes: 30 - - docarray-test-tensorflow: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install protobuf==3.19.0 - poetry run pip install tensorflow==2.11.0 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m 'tensorflow' tests - timeout-minutes: 30 - - docarray-test-benchmarks: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - - - name: Test - id: test - run: | - poetry run pytest -m 'benchmark' tests - timeout-minutes: 30 +# +# +# docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# test-path: [tests/integrations, tests/units, tests/documentation] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# rm poetry.lock +# poetry install --all-extras +# poetry run pip install elasticsearch==8.6.2 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py +# timeout-minutes: 30 +# env: +# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" +# +# +# docarray-test-proto3: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install protobuf==3.19.0 # we check that we support 3.19 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'proto' tests +# timeout-minutes: 30 +# +# +# docarray-doc-index: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install protobuf==3.19.0 +# poetry run pip install tensorflow==2.11.0 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }} +# timeout-minutes: 30 +# +# +# docarray-elastic-v8: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install protobuf==3.19.0 +# poetry run pip install tensorflow==2.11.0 +# poetry run pip install elasticsearch==8.6.2 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'index and elasticv8' tests +# timeout-minutes: 30 +# +# docarray-test-tensorflow: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install protobuf==3.19.0 +# poetry run pip install tensorflow==2.11.0 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'tensorflow' tests +# timeout-minutes: 30 +# +# docarray-test-benchmarks: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'benchmark' tests +# timeout-minutes: 30 # just for blocking the merge until all parallel core-test are successful success-all-test: - needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] +# needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] if: always() runs-on: ubuntu-latest steps: From 5d96808bd443737629c75dc4377a5602a3faa41f Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:37:57 +0200 Subject: [PATCH 12/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/ci.yml | 582 +++++++++++++++++++-------------------- 1 file changed, 291 insertions(+), 291 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9977869261e..6c2a4b9e811 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,120 +11,120 @@ on: jobs: -# lint-ruff: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python 3.7 -# uses: actions/setup-python@v4 -# with: -# python-version: 3.7 -# - name: Lint with ruff -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install -# -# # stop the build if there are Python syntax errors or undefined names -# poetry run ruff docarray -# # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide -# poetry run ruff docarray -# -# check-black: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python 3.7 -# uses: actions/setup-python@v4 -# with: -# python-version: 3.7 -# - name: check black -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --only dev -# poetry run black --check . -# -# env: -# CHANGED_FILES: ${{ steps.file_changes.outputs.added_modified }} -# -# import-test: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python 3.7 -# uses: actions/setup-python@v4 -# with: -# python-version: 3.7 -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --without dev -# poetry run pip install tensorflow==2.11.0 -# - name: Test basic import -# run: poetry run python -c 'from docarray import DocList, BaseDoc' -# -# -# check-mypy: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python 3.7 -# uses: actions/setup-python@v4 + lint-ruff: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python 3.7 + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: Lint with ruff + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install + + # stop the build if there are Python syntax errors or undefined names + poetry run ruff docarray + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + poetry run ruff docarray + + check-black: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python 3.7 + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: check black + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --only dev + poetry run black --check . + + env: + CHANGED_FILES: ${{ steps.file_changes.outputs.added_modified }} + + import-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python 3.7 + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --without dev + poetry run pip install tensorflow==2.11.0 + - name: Test basic import + run: poetry run python -c 'from docarray import DocList, BaseDoc' + + + check-mypy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python 3.7 + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: check mypy + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run mypy docarray + + + docarray-test: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + test-path: [tests/integrations, tests/units, tests/documentation] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install elasticsearch==8.6.2 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py + timeout-minutes: 30 + env: + JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" +# - name: Check codecov file +# id: check_files +# uses: andstor/file-existence-action@v1 # with: -# python-version: 3.7 -# - name: check mypy -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run mypy docarray -# -# -# docarray-test: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# test-path: [tests/integrations, tests/units, tests/documentation] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 +# files: "coverage.xml" +# - name: Upload coverage from test to Codecov +# uses: codecov/codecov-action@v3.1.1 +# if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' # with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install elasticsearch==8.6.2 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py -# timeout-minutes: 30 -# env: -# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" -## - name: Check codecov file -## id: check_files -## uses: andstor/file-existence-action@v1 -## with: -## files: "coverage.xml" -## - name: Upload coverage from test to Codecov -## uses: codecov/codecov-action@v3.1.1 -## if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' -## with: -## file: coverage.xml -## flags: ${{ steps.test.outputs.codecov_flag }} -## fail_ci_if_error: false -## token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos +# file: coverage.xml +# flags: ${{ steps.test.outputs.codecov_flag }} +# fail_ci_if_error: false +# token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos docarray-test-jac: @@ -156,188 +156,188 @@ jobs: timeout-minutes: 30 env: JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" -# -# -# docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# test-path: [tests/integrations, tests/units, tests/documentation] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# rm poetry.lock -# poetry install --all-extras -# poetry run pip install elasticsearch==8.6.2 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py -# timeout-minutes: 30 -# env: -# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" -# -# -# docarray-test-proto3: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install protobuf==3.19.0 # we check that we support 3.19 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'proto' tests -# timeout-minutes: 30 -# -# -# docarray-doc-index: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install protobuf==3.19.0 -# poetry run pip install tensorflow==2.11.0 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }} -# timeout-minutes: 30 -# -# -# docarray-elastic-v8: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install protobuf==3.19.0 -# poetry run pip install tensorflow==2.11.0 -# poetry run pip install elasticsearch==8.6.2 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'index and elasticv8' tests -# timeout-minutes: 30 -# -# docarray-test-tensorflow: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install protobuf==3.19.0 -# poetry run pip install tensorflow==2.11.0 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'tensorflow' tests -# timeout-minutes: 30 -# -# docarray-test-benchmarks: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'benchmark' tests -# timeout-minutes: 30 + + + docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + test-path: [tests/integrations, tests/units, tests/documentation] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + rm poetry.lock + poetry install --all-extras + poetry run pip install elasticsearch==8.6.2 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py + timeout-minutes: 30 + env: + JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" + + + docarray-test-proto3: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install protobuf==3.19.0 # we check that we support 3.19 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'proto' tests + timeout-minutes: 30 + + + docarray-doc-index: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install protobuf==3.19.0 + poetry run pip install tensorflow==2.11.0 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }} + timeout-minutes: 30 + + + docarray-elastic-v8: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install protobuf==3.19.0 + poetry run pip install tensorflow==2.11.0 + poetry run pip install elasticsearch==8.6.2 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'index and elasticv8' tests + timeout-minutes: 30 + + docarray-test-tensorflow: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install protobuf==3.19.0 + poetry run pip install tensorflow==2.11.0 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'tensorflow' tests + timeout-minutes: 30 + + docarray-test-benchmarks: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + + - name: Test + id: test + run: | + poetry run pytest -m 'benchmark' tests + timeout-minutes: 30 # just for blocking the merge until all parallel core-test are successful success-all-test: -# needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] + needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] if: always() runs-on: ubuntu-latest steps: From 78b30109daee8c45c6502848007d32686a0015c5 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:38:21 +0200 Subject: [PATCH 13/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/ci.yml | 582 +++++++++++++++++++-------------------- 1 file changed, 291 insertions(+), 291 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c2a4b9e811..9977869261e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,120 +11,120 @@ on: jobs: - lint-ruff: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: Lint with ruff - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install - - # stop the build if there are Python syntax errors or undefined names - poetry run ruff docarray - # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - poetry run ruff docarray - - check-black: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: check black - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --only dev - poetry run black --check . - - env: - CHANGED_FILES: ${{ steps.file_changes.outputs.added_modified }} - - import-test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --without dev - poetry run pip install tensorflow==2.11.0 - - name: Test basic import - run: poetry run python -c 'from docarray import DocList, BaseDoc' - - - check-mypy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 - uses: actions/setup-python@v4 - with: - python-version: 3.7 - - name: check mypy - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run mypy docarray - - - docarray-test: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - test-path: [tests/integrations, tests/units, tests/documentation] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install elasticsearch==8.6.2 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py - timeout-minutes: 30 - env: - JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" -# - name: Check codecov file -# id: check_files -# uses: andstor/file-existence-action@v1 +# lint-ruff: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python 3.7 +# uses: actions/setup-python@v4 +# with: +# python-version: 3.7 +# - name: Lint with ruff +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install +# +# # stop the build if there are Python syntax errors or undefined names +# poetry run ruff docarray +# # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide +# poetry run ruff docarray +# +# check-black: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python 3.7 +# uses: actions/setup-python@v4 # with: -# files: "coverage.xml" -# - name: Upload coverage from test to Codecov -# uses: codecov/codecov-action@v3.1.1 -# if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' +# python-version: 3.7 +# - name: check black +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --only dev +# poetry run black --check . +# +# env: +# CHANGED_FILES: ${{ steps.file_changes.outputs.added_modified }} +# +# import-test: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python 3.7 +# uses: actions/setup-python@v4 # with: -# file: coverage.xml -# flags: ${{ steps.test.outputs.codecov_flag }} -# fail_ci_if_error: false -# token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos +# python-version: 3.7 +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --without dev +# poetry run pip install tensorflow==2.11.0 +# - name: Test basic import +# run: poetry run python -c 'from docarray import DocList, BaseDoc' +# +# +# check-mypy: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python 3.7 +# uses: actions/setup-python@v4 +# with: +# python-version: 3.7 +# - name: check mypy +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run mypy docarray +# +# +# docarray-test: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# test-path: [tests/integrations, tests/units, tests/documentation] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install elasticsearch==8.6.2 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py +# timeout-minutes: 30 +# env: +# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" +## - name: Check codecov file +## id: check_files +## uses: andstor/file-existence-action@v1 +## with: +## files: "coverage.xml" +## - name: Upload coverage from test to Codecov +## uses: codecov/codecov-action@v3.1.1 +## if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' +## with: +## file: coverage.xml +## flags: ${{ steps.test.outputs.codecov_flag }} +## fail_ci_if_error: false +## token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos docarray-test-jac: @@ -156,188 +156,188 @@ jobs: timeout-minutes: 30 env: JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" - - - docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - test-path: [tests/integrations, tests/units, tests/documentation] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - rm poetry.lock - poetry install --all-extras - poetry run pip install elasticsearch==8.6.2 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py - timeout-minutes: 30 - env: - JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" - - - docarray-test-proto3: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install protobuf==3.19.0 # we check that we support 3.19 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m 'proto' tests - timeout-minutes: 30 - - - docarray-doc-index: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install protobuf==3.19.0 - poetry run pip install tensorflow==2.11.0 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }} - timeout-minutes: 30 - - - docarray-elastic-v8: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install protobuf==3.19.0 - poetry run pip install tensorflow==2.11.0 - poetry run pip install elasticsearch==8.6.2 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m 'index and elasticv8' tests - timeout-minutes: 30 - - docarray-test-tensorflow: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - poetry run pip install protobuf==3.19.0 - poetry run pip install tensorflow==2.11.0 - sudo apt-get update - sudo apt-get install --no-install-recommends ffmpeg - - - name: Test - id: test - run: | - poetry run pytest -m 'tensorflow' tests - timeout-minutes: 30 - - docarray-test-benchmarks: - needs: [lint-ruff, check-black, import-test] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: [3.7] - steps: - - uses: actions/checkout@v2.5.0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Prepare environment - run: | - python -m pip install --upgrade pip - python -m pip install poetry - poetry install --all-extras - - - name: Test - id: test - run: | - poetry run pytest -m 'benchmark' tests - timeout-minutes: 30 +# +# +# docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# test-path: [tests/integrations, tests/units, tests/documentation] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# rm poetry.lock +# poetry install --all-extras +# poetry run pip install elasticsearch==8.6.2 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py +# timeout-minutes: 30 +# env: +# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" +# +# +# docarray-test-proto3: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install protobuf==3.19.0 # we check that we support 3.19 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'proto' tests +# timeout-minutes: 30 +# +# +# docarray-doc-index: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install protobuf==3.19.0 +# poetry run pip install tensorflow==2.11.0 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }} +# timeout-minutes: 30 +# +# +# docarray-elastic-v8: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install protobuf==3.19.0 +# poetry run pip install tensorflow==2.11.0 +# poetry run pip install elasticsearch==8.6.2 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'index and elasticv8' tests +# timeout-minutes: 30 +# +# docarray-test-tensorflow: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# poetry run pip install protobuf==3.19.0 +# poetry run pip install tensorflow==2.11.0 +# sudo apt-get update +# sudo apt-get install --no-install-recommends ffmpeg +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'tensorflow' tests +# timeout-minutes: 30 +# +# docarray-test-benchmarks: +# needs: [lint-ruff, check-black, import-test] +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.7] +# steps: +# - uses: actions/checkout@v2.5.0 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v4 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Prepare environment +# run: | +# python -m pip install --upgrade pip +# python -m pip install poetry +# poetry install --all-extras +# +# - name: Test +# id: test +# run: | +# poetry run pytest -m 'benchmark' tests +# timeout-minutes: 30 # just for blocking the merge until all parallel core-test are successful success-all-test: - needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] +# needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] if: always() runs-on: ubuntu-latest steps: From df16881ea6239a20c66666b7c29f79ab57feb47d Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:41:08 +0200 Subject: [PATCH 14/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/ci.yml | 582 +++++++++++++++++++-------------------- 1 file changed, 291 insertions(+), 291 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9977869261e..6c2a4b9e811 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,120 +11,120 @@ on: jobs: -# lint-ruff: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python 3.7 -# uses: actions/setup-python@v4 -# with: -# python-version: 3.7 -# - name: Lint with ruff -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install -# -# # stop the build if there are Python syntax errors or undefined names -# poetry run ruff docarray -# # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide -# poetry run ruff docarray -# -# check-black: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python 3.7 -# uses: actions/setup-python@v4 -# with: -# python-version: 3.7 -# - name: check black -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --only dev -# poetry run black --check . -# -# env: -# CHANGED_FILES: ${{ steps.file_changes.outputs.added_modified }} -# -# import-test: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python 3.7 -# uses: actions/setup-python@v4 -# with: -# python-version: 3.7 -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --without dev -# poetry run pip install tensorflow==2.11.0 -# - name: Test basic import -# run: poetry run python -c 'from docarray import DocList, BaseDoc' -# -# -# check-mypy: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python 3.7 -# uses: actions/setup-python@v4 + lint-ruff: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python 3.7 + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: Lint with ruff + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install + + # stop the build if there are Python syntax errors or undefined names + poetry run ruff docarray + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + poetry run ruff docarray + + check-black: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python 3.7 + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: check black + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --only dev + poetry run black --check . + + env: + CHANGED_FILES: ${{ steps.file_changes.outputs.added_modified }} + + import-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python 3.7 + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --without dev + poetry run pip install tensorflow==2.11.0 + - name: Test basic import + run: poetry run python -c 'from docarray import DocList, BaseDoc' + + + check-mypy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python 3.7 + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: check mypy + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run mypy docarray + + + docarray-test: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + test-path: [tests/integrations, tests/units, tests/documentation] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install elasticsearch==8.6.2 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py + timeout-minutes: 30 + env: + JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" +# - name: Check codecov file +# id: check_files +# uses: andstor/file-existence-action@v1 # with: -# python-version: 3.7 -# - name: check mypy -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run mypy docarray -# -# -# docarray-test: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# test-path: [tests/integrations, tests/units, tests/documentation] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 +# files: "coverage.xml" +# - name: Upload coverage from test to Codecov +# uses: codecov/codecov-action@v3.1.1 +# if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' # with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install elasticsearch==8.6.2 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py -# timeout-minutes: 30 -# env: -# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" -## - name: Check codecov file -## id: check_files -## uses: andstor/file-existence-action@v1 -## with: -## files: "coverage.xml" -## - name: Upload coverage from test to Codecov -## uses: codecov/codecov-action@v3.1.1 -## if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' -## with: -## file: coverage.xml -## flags: ${{ steps.test.outputs.codecov_flag }} -## fail_ci_if_error: false -## token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos +# file: coverage.xml +# flags: ${{ steps.test.outputs.codecov_flag }} +# fail_ci_if_error: false +# token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos docarray-test-jac: @@ -156,188 +156,188 @@ jobs: timeout-minutes: 30 env: JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" -# -# -# docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# test-path: [tests/integrations, tests/units, tests/documentation] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# rm poetry.lock -# poetry install --all-extras -# poetry run pip install elasticsearch==8.6.2 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py -# timeout-minutes: 30 -# env: -# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" -# -# -# docarray-test-proto3: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install protobuf==3.19.0 # we check that we support 3.19 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'proto' tests -# timeout-minutes: 30 -# -# -# docarray-doc-index: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install protobuf==3.19.0 -# poetry run pip install tensorflow==2.11.0 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }} -# timeout-minutes: 30 -# -# -# docarray-elastic-v8: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install protobuf==3.19.0 -# poetry run pip install tensorflow==2.11.0 -# poetry run pip install elasticsearch==8.6.2 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'index and elasticv8' tests -# timeout-minutes: 30 -# -# docarray-test-tensorflow: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# poetry run pip install protobuf==3.19.0 -# poetry run pip install tensorflow==2.11.0 -# sudo apt-get update -# sudo apt-get install --no-install-recommends ffmpeg -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'tensorflow' tests -# timeout-minutes: 30 -# -# docarray-test-benchmarks: -# needs: [lint-ruff, check-black, import-test] -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.7] -# steps: -# - uses: actions/checkout@v2.5.0 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v4 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Prepare environment -# run: | -# python -m pip install --upgrade pip -# python -m pip install poetry -# poetry install --all-extras -# -# - name: Test -# id: test -# run: | -# poetry run pytest -m 'benchmark' tests -# timeout-minutes: 30 + + + docarray-test-uncaped: # do test without using poetry lock. This does not block ci passing + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + test-path: [tests/integrations, tests/units, tests/documentation] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + rm poetry.lock + poetry install --all-extras + poetry run pip install elasticsearch==8.6.2 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m "not (tensorflow or benchmark or index)" ${{ matrix.test-path }} --ignore=tests/integrations/store/test_jac.py + timeout-minutes: 30 + env: + JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" + + + docarray-test-proto3: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install protobuf==3.19.0 # we check that we support 3.19 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'proto' tests + timeout-minutes: 30 + + + docarray-doc-index: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install protobuf==3.19.0 + poetry run pip install tensorflow==2.11.0 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }} + timeout-minutes: 30 + + + docarray-elastic-v8: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install protobuf==3.19.0 + poetry run pip install tensorflow==2.11.0 + poetry run pip install elasticsearch==8.6.2 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'index and elasticv8' tests + timeout-minutes: 30 + + docarray-test-tensorflow: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + poetry run pip install protobuf==3.19.0 + poetry run pip install tensorflow==2.11.0 + sudo apt-get update + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'tensorflow' tests + timeout-minutes: 30 + + docarray-test-benchmarks: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + + - name: Test + id: test + run: | + poetry run pytest -m 'benchmark' tests + timeout-minutes: 30 # just for blocking the merge until all parallel core-test are successful success-all-test: -# needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] + needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-elastic-v8, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] if: always() runs-on: ubuntu-latest steps: From f52a3400f2e54c4f08b60402249882630df40d6b Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:41:23 +0200 Subject: [PATCH 15/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index e9307ca7ee5..b667be0bba3 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -11,8 +11,8 @@ on: jobs: success-all-test: uses: ./.github/workflows/ci.yml -# env: -# JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" + env: + JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" prerelease: needs: [success-all-test] From adc23d61fc73febac9d8b428dba7c07e9c2ae9f5 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:45:32 +0200 Subject: [PATCH 16/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index b667be0bba3..1cbaaf3bda9 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -11,7 +11,7 @@ on: jobs: success-all-test: uses: ./.github/workflows/ci.yml - env: + secrets: JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" prerelease: From 153143ca0daeba61914b31b4d7dc3694d61a90c4 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:45:56 +0200 Subject: [PATCH 17/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 1cbaaf3bda9..ca3f625c244 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -11,7 +11,7 @@ on: jobs: success-all-test: uses: ./.github/workflows/ci.yml - secrets: + secrets: JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" prerelease: From 0f9ab2fd9fdf45d7ad9ef9b86e6e54d04d3b0346 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:47:30 +0200 Subject: [PATCH 18/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/cd.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ca3f625c244..906de99692e 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -11,8 +11,7 @@ on: jobs: success-all-test: uses: ./.github/workflows/ci.yml - secrets: - JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" + prerelease: needs: [success-all-test] From b237b319f36df519b49eb84f9500a26bb31e8d06 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:49:27 +0200 Subject: [PATCH 19/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/cd.yml | 3 ++- .github/workflows/ci.yml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 906de99692e..ca3f625c244 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -11,7 +11,8 @@ on: jobs: success-all-test: uses: ./.github/workflows/ci.yml - + secrets: + JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" prerelease: needs: [success-all-test] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c2a4b9e811..f60b0cb1f36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,9 @@ on: inputs: config-path: type: string + secrets: + JINA_AUTH_TOKEN: + required: false # pull_request: # types: [opened, synchronize, reopened] From 200f16ed22118d4b97f91092db63a8da2b9325e0 Mon Sep 17 00:00:00 2001 From: samsja Date: Fri, 5 May 2023 10:58:48 +0200 Subject: [PATCH 20/20] chore: pass ci Signed-off-by: samsja --- .github/workflows/cd.yml | 3 --- .github/workflows/ci.yml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ca3f625c244..76c1bd87c60 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -4,9 +4,6 @@ on: push: branches: - main - - chore-fix-prerelease - pull_request: - types: [opened, synchronize, reopened] jobs: success-all-test: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f60b0cb1f36..a5f55139f06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,8 +8,8 @@ on: secrets: JINA_AUTH_TOKEN: required: false -# pull_request: -# types: [opened, synchronize, reopened] + pull_request: + types: [opened, synchronize, reopened] jobs: