Skip to content

Commit 677dfe8

Browse files
IgorChvyrov-smIgorChvyrov-sm
authored
Merge branch 'main' into reset_and_bump_1.1.11
2 parents fc589dc + 225f598 commit 677dfe8

1,544 files changed

Lines changed: 257243 additions & 65320 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/pull_request.yml‎

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ jobs:
1212
env:
1313
COVERAGE_FILE: coverage.xml
1414
COVERAGE_DIR: .coverage-reports
15+
CONDUCTOR_AUTH_KEY: ${{ secrets.AUTH_KEY }}
16+
CONDUCTOR_AUTH_SECRET: ${{ secrets.AUTH_SECRET }}
17+
CONDUCTOR_SERVER_URL: ${{ vars.SERVER_URL }}
1518
steps:
1619
- name: Checkout code
1720
uses: actions/checkout@v4
@@ -34,9 +37,9 @@ jobs:
3437
continue-on-error: true
3538
run: |
3639
docker run --rm \
37-
-e CONDUCTOR_AUTH_KEY=${{ secrets.CONDUCTOR_AUTH_KEY }} \
38-
-e CONDUCTOR_AUTH_SECRET=${{ secrets.CONDUCTOR_AUTH_SECRET }} \
39-
-e CONDUCTOR_SERVER_URL=${{ secrets.CONDUCTOR_SERVER_URL }} \
40+
-e CONDUCTOR_AUTH_KEY=${{ env.CONDUCTOR_AUTH_KEY }} \
41+
-e CONDUCTOR_AUTH_SECRET=${{ env.CONDUCTOR_AUTH_SECRET }} \
42+
-e CONDUCTOR_SERVER_URL=${{ env.CONDUCTOR_SERVER_URL }} \
4043
-v ${{ github.workspace }}/${{ env.COVERAGE_DIR }}:/package/${{ env.COVERAGE_DIR }}:rw \
4144
conductor-sdk-test:latest \
4245
/bin/sh -c "cd /package && COVERAGE_FILE=/package/${{ env.COVERAGE_DIR }}/.coverage.unit coverage run -m pytest tests/unit -v"
@@ -46,9 +49,9 @@ jobs:
4649
continue-on-error: true
4750
run: |
4851
docker run --rm \
49-
-e CONDUCTOR_AUTH_KEY=${{ secrets.CONDUCTOR_AUTH_KEY }} \
50-
-e CONDUCTOR_AUTH_SECRET=${{ secrets.CONDUCTOR_AUTH_SECRET }} \
51-
-e CONDUCTOR_SERVER_URL=${{ secrets.CONDUCTOR_SERVER_URL }} \
52+
-e CONDUCTOR_AUTH_KEY=${{ env.CONDUCTOR_AUTH_KEY }} \
53+
-e CONDUCTOR_AUTH_SECRET=${{ env.CONDUCTOR_AUTH_SECRET }} \
54+
-e CONDUCTOR_SERVER_URL=${{ env.CONDUCTOR_SERVER_URL }} \
5255
-v ${{ github.workspace }}/${{ env.COVERAGE_DIR }}:/package/${{ env.COVERAGE_DIR }}:rw \
5356
conductor-sdk-test:latest \
5457
/bin/sh -c "cd /package && COVERAGE_FILE=/package/${{ env.COVERAGE_DIR }}/.coverage.bc coverage run -m pytest tests/backwardcompatibility -v"
@@ -58,13 +61,37 @@ jobs:
5861
continue-on-error: true
5962
run: |
6063
docker run --rm \
61-
-e CONDUCTOR_AUTH_KEY=${{ secrets.CONDUCTOR_AUTH_KEY }} \
62-
-e CONDUCTOR_AUTH_SECRET=${{ secrets.CONDUCTOR_AUTH_SECRET }} \
63-
-e CONDUCTOR_SERVER_URL=${{ secrets.CONDUCTOR_SERVER_URL }} \
64+
-e CONDUCTOR_AUTH_KEY=${{ env.CONDUCTOR_AUTH_KEY }} \
65+
-e CONDUCTOR_AUTH_SECRET=${{ env.CONDUCTOR_AUTH_SECRET }} \
66+
-e CONDUCTOR_SERVER_URL=${{ env.CONDUCTOR_SERVER_URL }} \
6467
-v ${{ github.workspace }}/${{ env.COVERAGE_DIR }}:/package/${{ env.COVERAGE_DIR }}:rw \
6568
conductor-sdk-test:latest \
6669
/bin/sh -c "cd /package && COVERAGE_FILE=/package/${{ env.COVERAGE_DIR }}/.coverage.serdeser coverage run -m pytest tests/serdesertest -v"
6770
71+
- name: Run integration tests
72+
id: integration_tests
73+
continue-on-error: true
74+
run: |
75+
docker run --rm \
76+
-e CONDUCTOR_AUTH_KEY=${{ env.CONDUCTOR_AUTH_KEY }} \
77+
-e CONDUCTOR_AUTH_SECRET=${{ env.CONDUCTOR_AUTH_SECRET }} \
78+
-e CONDUCTOR_SERVER_URL=${{ env.CONDUCTOR_SERVER_URL }} \
79+
-v ${{ github.workspace }}/${{ env.COVERAGE_DIR }}:/package/${{ env.COVERAGE_DIR }}:rw \
80+
conductor-sdk-test:latest \
81+
/bin/sh -c "cd /package && COVERAGE_FILE=/package/${{ env.COVERAGE_DIR }}/.coverage.integration coverage run -m pytest -m v4 tests/integration -v"
82+
83+
- name: Run asyncio integration tests
84+
id: asyncio_integration_tests
85+
continue-on-error: true
86+
run: |
87+
docker run --rm \
88+
-e CONDUCTOR_AUTH_KEY=${{ env.CONDUCTOR_AUTH_KEY }} \
89+
-e CONDUCTOR_AUTH_SECRET=${{ env.CONDUCTOR_AUTH_SECRET }} \
90+
-e CONDUCTOR_SERVER_URL=${{ env.CONDUCTOR_SERVER_URL }} \
91+
-v ${{ github.workspace }}/${{ env.COVERAGE_DIR }}:/package/${{ env.COVERAGE_DIR }}:rw \
92+
conductor-sdk-test:latest \
93+
/bin/sh -c "cd /package && COVERAGE_FILE=/package/${{ env.COVERAGE_DIR }}/.coverage.asyncio_integration coverage run -m pytest -m v4 tests/integration/async -v"
94+
6895
- name: Generate coverage report
6996
id: coverage_report
7097
continue-on-error: true
@@ -96,5 +123,5 @@ jobs:
96123
file: ${{ env.COVERAGE_FILE }}
97124

98125
- name: Check test results
99-
if: steps.unit_tests.outcome == 'failure' || steps.bc_tests.outcome == 'failure' || steps.serdeser_tests.outcome == 'failure'
100-
run: exit 1
126+
if: steps.unit_tests.outcome == 'failure' || steps.bc_tests.outcome == 'failure' || steps.serdeser_tests.outcome == 'failure' || steps.integration_tests.outcome == 'failure' || steps.asyncio_integration_tests.outcome == 'failure'
127+
run: exit 1

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ latest.txt
161161

162162
*.so
163163

164-
codegen/
165-
166164
.vscode/
167165
tests/unit/automator/_trial_temp/_trial_marker
168166
tests/unit/automator/_trial_temp/_trial_marker

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ WORKDIR /package
4848
RUN curl -sSL https://install.python-poetry.org | python3 -
4949
ENV PATH "/root/.local/bin:$PATH"
5050

51-
COPY pyproject.toml poetry.lock /package/
51+
COPY pyproject.toml poetry.lock README.md /package/
5252
COPY --from=python_test_base /package/src /package/src
5353

5454
RUN poetry config virtualenvs.create false && \

0 commit comments

Comments
 (0)