Skip to content

Commit 90d1d8b

Browse files
authored
Merge branch 'main' into aj/chore/add-ruff-lint-rules-2
2 parents 5d3dc2e + 57e1b52 commit 90d1d8b

File tree

95 files changed

+3880
-3099
lines changed

Some content is hidden

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

95 files changed

+3880
-3099
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ updates:
2121
commit-message:
2222
prefix: "ci(deps): "
2323
schedule:
24-
interval: daily
24+
interval: monthly
2525
labels:
2626
- ci
2727
groups:

.github/workflows/autofix-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
- name: Set up Poetry
7676
uses: Gr1N/setup-poetry@v9
7777
with:
78-
poetry-version: "1.7.1"
78+
poetry-version: "1.8.4"
7979
- name: Set up Python
8080
uses: actions/setup-python@v5
8181
with:

.github/workflows/connector-tests.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,14 @@ jobs:
8888
# cdk_extra: n/a
8989
# TODO: These are manifest connectors and won't work as expected until we
9090
# add `--use-local-cdk` support for manifest connectors.
91-
# - connector: source-the-guardian-api
92-
# cdk_extra: n/a
93-
# - connector: source-pokeapi
94-
# cdk_extra: n/a
91+
- connector: source-the-guardian-api
92+
cdk_extra: n/a
93+
- connector: source-pokeapi
94+
cdk_extra: n/a
9595

9696
name: "Check: '${{matrix.connector}}' (skip=${{needs.cdk_changes.outputs['src'] == 'false' || needs.cdk_changes.outputs[matrix.cdk_extra] == 'false'}})"
97+
permissions:
98+
checks: write
9799
steps:
98100
- name: Abort if extra not changed (${{matrix.cdk_extra}})
99101
id: no_changes
@@ -131,15 +133,18 @@ jobs:
131133
run: |
132134
cd airbyte
133135
make tools.airbyte-ci-dev.install
134-
airbyte-ci-dev connectors \
136+
airbyte-ci-dev \
137+
--ci-report-bucket-name=airbyte-ci-reports-multi \
138+
connectors \
135139
--name ${{matrix.connector}} \
136140
--use-local-cdk \
137141
test \
138142
--fail-fast \
139143
--skip-step qa_checks \
140144
--skip-step connector_live_tests
141145
142-
- name: Evaluate Test Output
146+
- name: Evaluate Test
147+
id: evaluate_output
143148
if: always() && steps.no_changes.outputs.status != 'cancelled'
144149
run: |
145150
# save job output json file as ci step output
@@ -148,17 +153,22 @@ jobs:
148153
success=$(echo ${job_output} | jq -r '.success')
149154
failed_step=$(echo ${job_output} | jq -r '.failed_steps | select(length > 0) | .[0] // "None"')
150155
run_duration=$(echo ${job_output} | jq -r '.run_duration')
156+
html_report_url=$(echo ${job_output} | jq -r '.html_report_url')
151157
echo "## Job Output for ${{matrix.connector}}" >> $GITHUB_STEP_SUMMARY
158+
echo "- [HTML Report](${html_report_url})" >> $GITHUB_STEP_SUMMARY
152159
echo "- Success: ${success}" >> $GITHUB_STEP_SUMMARY
153160
echo "- Test Duration: $(printf "%.0f" ${run_duration})s" >> $GITHUB_STEP_SUMMARY
154161
if [ "${success}" != "true" ]; then
155162
echo "- Failed Step: ${failed_step}" >> $GITHUB_STEP_SUMMARY
156163
fi
157164
echo -e "\n[Download Job Output](${{steps.upload_job_output.outputs.artifact-url}})" >> $GITHUB_STEP_SUMMARY
158165
if [ "${success}" != "true" ]; then
159-
echo "::error::Test failed for connector '${{ matrix.connector }}' on step '${failed_step}'. Check the logs for more details."
166+
echo "::error::Test failed for connector '${{ matrix.connector }}' on step '${failed_step}'. "
160167
exit 1
161168
fi
169+
echo "See the execution report for details: ${html_report_url}"
170+
echo "success=${success}" >> $GITHUB_OUTPUT
171+
echo "html_report_url=${html_report_url}" >> $GITHUB_OUTPUT
162172
163173
# Upload the job output to the artifacts
164174
- name: Upload Job Output

.github/workflows/pdoc_preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Poetry
1717
uses: Gr1N/setup-poetry@v9
1818
with:
19-
poetry-version: "1.7.1"
19+
poetry-version: "1.8.4"
2020
- name: Set up Python
2121
uses: actions/setup-python@v5
2222
with:

.github/workflows/pdoc_publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Set up Poetry
3434
uses: Gr1N/setup-poetry@v9
3535
with:
36-
poetry-version: "1.7.1"
36+
poetry-version: "1.8.4"
3737
- name: Set up Python
3838
uses: actions/setup-python@v5
3939
with:

.github/workflows/poetry-lock-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
- name: Set up Poetry
7373
uses: Gr1N/setup-poetry@v9
7474
with:
75-
poetry-version: "1.7.1"
75+
poetry-version: "1.8.4"
7676
- name: Set up Python
7777
uses: actions/setup-python@v5
7878
with:

.github/workflows/publish_sdm_connector.yml

Lines changed: 0 additions & 178 deletions
This file was deleted.

.github/workflows/pypi_publish.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
workflow_dispatch:
1515
inputs:
1616
version:
17-
description: "Version. The version to publish, ie 1.0.0 or 1.0.0-dev1. In most cases, you can leave this blank. If run from a release tag (recommended), the version number will be inferred from the git tag."
17+
description: "Note that this workflow is intended for prereleases. For public-facing stable releases, please use the GitHub Releases workflow instead: https://github.com/airbytehq/airbyte-python-cdk/blob/main/docs/RELEASES.md. If running this workflow from main or from a dev branch, please enter the desired version number here, for instance 1.2.3dev0 or 1.2.3rc1."
1818
required: false
1919
publish_to_pypi:
2020
description: "Publish to PyPI. If true, the workflow will publish to PyPI."
@@ -30,7 +30,7 @@ on:
3030
description: "Update Connector Builder. If true, the workflow will create a PR to bump the CDK version used by Connector Builder."
3131
type: boolean
3232
required: true
33-
default: true
33+
default: false
3434

3535
jobs:
3636
build:
@@ -150,11 +150,9 @@ jobs:
150150

151151
publish_sdm:
152152
name: Publish SDM to DockerHub
153-
# TODO: When we're ready to publish after each release, prefix the `if` below with:
154-
# (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) ||
155-
# Until then, this workflow needs to be kicked off manually.
156-
# Last remaining blocker documented here: https://github.com/airbytehq/airbyte-python-cdk/issues/64
157153
if: >
154+
(github.event_name == 'push' &&
155+
startsWith(github.ref, 'refs/tags/v')) ||
158156
(github.event_name == 'workflow_dispatch' &&
159157
github.event.inputs.publish_to_dockerhub == 'true'
160158
)
@@ -249,6 +247,7 @@ jobs:
249247
needs:
250248
- build
251249
- publish_cdk
250+
- publish_sdm
252251
if: >
253252
(github.event_name == 'push' &&
254253
needs.build.outputs.IS_PRERELEASE == 'false' &&
@@ -288,7 +287,7 @@ jobs:
288287
pip-compile --upgrade
289288
- name: Create Pull Request
290289
id: create-pull-request
291-
uses: peter-evans/create-pull-request@v6
290+
uses: peter-evans/create-pull-request@v7
292291
with:
293292
token: ${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}
294293
commit-message: "chore: update CDK version following release"

.github/workflows/pytest_fast.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ jobs:
1414
- name: Checkout code
1515
uses: actions/checkout@v4
1616

17+
- name: Set up Poetry
18+
uses: Gr1N/setup-poetry@v9
19+
with:
20+
poetry-version: "1.8.4"
21+
22+
- name: Check Poetry lock file is current
23+
run: poetry check
24+
1725
- uses: hynek/build-and-inspect-python-package@v2
1826
env:
1927
# Pass in dummy version '0.0.0dev0' version to appease dynamic versioning
@@ -36,7 +44,7 @@ jobs:
3644
- name: Set up Poetry
3745
uses: Gr1N/setup-poetry@v9
3846
with:
39-
poetry-version: "1.7.1"
47+
poetry-version: "1.8.4"
4048
- name: Set up Python
4149
uses: actions/setup-python@v5
4250
with:

.github/workflows/pytest_matrix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
name: Pytest (All, Python ${{ matrix.python-version }}, ${{ matrix.os }})
2424
# Don't run on forks. Run on pushes to main, and on PRs that are not from forks.
2525
if: >
26-
(github.event_name == 'push' && github.ref == 'refs/heads/main') ||
27-
(github.event.pull_request.head.repo.fork == false)
26+
github.event_name == 'pull_request' ||
27+
(github.event_name == 'push' && github.ref == 'refs/heads/main')
2828
strategy:
2929
matrix:
3030
python-version: [
@@ -61,7 +61,7 @@ jobs:
6161
uses: Gr1N/setup-poetry@v9
6262
if: steps.changes.outputs.src == 'true'
6363
with:
64-
poetry-version: "1.7.1"
64+
poetry-version: "1.8.4"
6565
- name: Set up Python
6666
uses: actions/setup-python@v5
6767
if: steps.changes.outputs.src == 'true'

0 commit comments

Comments
 (0)