Skip to content

Commit 2e430c1

Browse files
committed
Update on-merge workflow
1 parent 04aa5d1 commit 2e430c1

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

.github/workflows/on-merge.yaml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,38 +35,35 @@ jobs:
3535
uses: './.github/workflows/testing-unit.yaml'
3636
secrets: inherit
3737
with:
38-
python_versions_json: '["3.10", "3.13"]'
38+
python_versions_json: '["3.10", "3.11", "3.12", "3.13"]'
3939

4040
create-project:
4141
uses: './.github/workflows/project-setup.yaml'
4242
secrets: inherit
43-
needs:
44-
- unit-tests
4543

4644
integration-tests:
47-
uses: './.github/workflows/testing-integration.yaml'
48-
secrets: inherit
49-
needs:
50-
- unit-tests
51-
- create-project
52-
with:
53-
encrypted_project_api_key: ${{ needs.create-project.outputs.encrypted_project_api_key }}
54-
python_versions_json: '["3.10", "3.13"]'
45+
if: always() && (needs.create-project.result == 'success')
46+
uses: './.github/workflows/testing-integration.yaml'
47+
secrets: inherit
48+
needs:
49+
- create-project
50+
with:
51+
encrypted_project_api_key: ${{ needs.create-project.outputs.encrypted_project_api_key }}
52+
python_versions_json: '["3.10", "3.13"]'
53+
dense_index_host: ${{ needs.create-project.outputs.index_host_dense }}
54+
sparse_index_host: ${{ needs.create-project.outputs.index_host_sparse }}
55+
5556
dependency-tests:
5657
uses: './.github/workflows/testing-dependency.yaml'
5758
secrets: inherit
5859
needs:
59-
- unit-tests
6060
- create-project
6161
with:
6262
encrypted_project_api_key: ${{ needs.create-project.outputs.encrypted_project_api_key }}
6363

6464
install-tests:
6565
uses: './.github/workflows/testing-install.yaml'
6666
secrets: inherit
67-
needs:
68-
- unit-tests
69-
- create-project
7067

7168
cleanup-project:
7269
if: ${{ always() }}

0 commit comments

Comments
 (0)