Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/airbytehq/airbyte into to…
Browse files Browse the repository at this point in the history
…pe/braze/migrate-manifest-only
  • Loading branch information
topefolorunso committed Jan 12, 2025
2 parents 6ecaed1 + 65b4d57 commit 71250f8
Show file tree
Hide file tree
Showing 5,086 changed files with 426,706 additions and 247,791 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
34 changes: 16 additions & 18 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@
/airbyte-integrations/connectors/destination-qdrant @airbytehq/ai-language-models
/airbyte-integrations/connectors/destination-chroma @airbytehq/ai-language-models
/airbyte-integrations/connectors/destination-snowflake-cortex @airbytehq/ai-language-models
/airbyte-cdk/python/airbyte_cdk/destinations/vector_db_based @airbytehq/ai-language-models

# CI/CD
/.github/ @airbytehq/dev-tooling
/airbyte-ci/ @airbytehq/dev-tooling

# Python CDK and Connector Acceptance Tests
/airbyte-cdk/python @airbytehq/python-team
/airbyte-integrations/connector-templates/ @airbytehq/dev-marketplace-contributions
/airbyte-integrations/bases/connector-acceptance-test/ @airbytehq/dev-tooling

Expand All @@ -23,27 +21,27 @@
/docs/understanding-airbyte/airbyte-protocol.md @airbytehq/protocol-reviewers

# Bulk CDK
/airbyte-cdk/bulk @airbytehq/dbsources @airbytehq/destinations
/airbyte-cdk/bulk @airbytehq/dbsources @airbytehq/move-destinations
/airbyte-cdk/bulk/core/extract/ @airbytehq/dbsources
/airbyte-cdk/bulk/core/load/ @airbytehq/destinations
/airbyte-cdk/bulk/core/load/ @airbytehq/move-destinations
/airbyte-cdk/bulk/toolkits/extract-*/ @airbytehq/dbsources
/airbyte-cdk/bulk/toolkits/load-*/ @airbytehq/destinations
/airbyte-cdk/bulk/toolkits/load-*/ @airbytehq/move-destinations

# Java CDK
/airbyte-cdk/java/airbyte-cdk @airbytehq/dbsources @airbytehq/destinations
/airbyte-cdk/java/airbyte-cdk @airbytehq/dbsources @airbytehq/move-destinations
/airbyte-cdk/java/airbyte-cdk/*-sources/ @airbytehq/dbsources
/airbyte-cdk/java/airbyte-cdk/*-destinations/ @airbytehq/destinations
/airbyte-cdk/java/airbyte-cdk/typing-deduping/ @airbytehq/destinations
/airbyte-cdk/java/airbyte-cdk/*-destinations/ @airbytehq/move-destinations
/airbyte-cdk/java/airbyte-cdk/typing-deduping/ @airbytehq/move-destinations

# Java connectors catch-all
/buildSrc/ @airbytehq/dbsources @airbytehq/destinations
/buildSrc/ @airbytehq/dbsources @airbytehq/move-destinations
/airbyte-integrations/connectors/source-*/**/*.java @airbytehq/dbsources
/airbyte-integrations/connectors/source-*/**/*.kt @airbytehq/dbsources
/airbyte-integrations/connectors/source-*/**/*.gradle @airbytehq/dbsources
/airbyte-integrations/connectors-performance/source-harness/ @airbytehq/dbsources
/airbyte-integrations/connectors/destination-*/**/*.java @airbytehq/destinations
/airbyte-integrations/connectors/destination-*/**/*.kt @airbytehq/destinations
/airbyte-integrations/connectors/destination-*/**/*.gradle @airbytehq/destinations
/airbyte-integrations/connectors/destination-*/**/*.java @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-*/**/*.kt @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-*/**/*.gradle @airbytehq/move-destinations
/airbyte-integrations/connectors-performance/destination-harness/ @airbytehq/dbsources

# Java-based certified or incubating source connectors
Expand All @@ -53,12 +51,12 @@
/airbyte-integrations/connectors/source-postgres/ @airbytehq/dbsources

# Java-based certified or incubating destination connectors
/airbyte-integrations/connectors/destination-bigquery/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-postgres/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-postgres-strict-encrypt/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-s3/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-snowflake/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-redshift/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-bigquery/ @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-postgres/ @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-postgres-strict-encrypt/ @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-s3/ @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-snowflake/ @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-redshift/ @airbytehq/move-destinations

# Python critical connectors
/airbyte-integrations/connectors/source-facebook-marketing/ @airbytehq/python-team
Expand Down
37 changes: 24 additions & 13 deletions .github/actions/install-airbyte-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,26 @@ runs:
- name: "Determine how Airbyte CI should be installed"
shell: bash
id: determine-install-mode
# When the PR is from a fork, we always install from binary
if: inputs.is_fork == 'false'
run: |
if [[ "${{ github.ref }}" != "refs/heads/master" ]] && [[ "${{ steps.changes.outputs.pipelines_any_changed }}" == "true" ]]; then
echo "Making changes to Airbyte CI on a non-master branch. Airbyte-CI will be installed from source."
echo "install-mode=source" >> $GITHUB_OUTPUT
echo "SENTRY_ENVIRONMENT=dev" >> $GITHUB_ENV
else
echo "install-mode=binary" >> $GITHUB_OUTPUT
echo "SENTRY_ENVIRONMENT=production" >> $GITHUB_ENV
fi
echo "install-mode=source" >> $GITHUB_OUTPUT
echo "SENTRY_ENVIRONMENT=dev" >> $GITHUB_ENV
# When the PR is from a fork, we always install from binary
# if: inputs.is_fork == 'false'
# run: |
# if [[ "${{ github.ref }}" != "refs/heads/master" ]] && [[ "${{ steps.changes.outputs.pipelines_any_changed }}" == "true" ]]; then
# echo "Making changes to Airbyte CI on a non-master branch. Airbyte-CI will be installed from source."
# echo "install-mode=source" >> $GITHUB_OUTPUT
# echo "SENTRY_ENVIRONMENT=dev" >> $GITHUB_ENV
# else
# echo "install-mode=binary" >> $GITHUB_OUTPUT
# echo "SENTRY_ENVIRONMENT=production" >> $GITHUB_ENV
# fi

- name: Install Airbyte CI from binary
id: install-airbyte-ci-binary
if: steps.determine-install-mode.outputs.install-mode == 'binary' || ${{ inputs.is_fork }} == 'true'
if: false
# if: steps.determine-install-mode.outputs.install-mode == 'binary' || ${{ inputs.is_fork }} == 'true'
shell: bash
run: |
curl -sSL ${{ inputs.airbyte_ci_binary_url }} --output airbyte-ci-bin
Expand All @@ -54,21 +59,27 @@ runs:
- name: Install Python 3.10
id: install-python-3-10
uses: actions/setup-python@v4
if: steps.determine-install-mode.outputs.install-mode == 'source'
# if: steps.determine-install-mode.outputs.install-mode == 'source'
with:
python-version: "3.10"
token: ${{ inputs.github_token }}

- name: Install Airbyte CI from source
id: install-airbyte-ci-source
if: steps.determine-install-mode.outputs.install-mode == 'source'
if: true
# if: steps.determine-install-mode.outputs.install-mode == 'source'
shell: bash
run: |
pip install --upgrade pip
pip install pipx
pipx ensurepath
pipx install ${{ inputs.path_to_airbyte_ci_source }}
- name: Print installed `airbyte-ci` version
shell: bash
run: |
airbyte-ci --version
- name: Get dagger engine image name
id: get-dagger-engine-image-name
shell: bash
Expand Down
17 changes: 16 additions & 1 deletion .github/actions/run-airbyte-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,15 @@ runs:
id: get-start-timestamp
shell: bash
run: echo "start-timestamp=$(date +%s)" >> $GITHUB_OUTPUT
- name: Debug-print local paths checked out
shell: bash
run: |
set -x
echo "Working directory: $(pwd)"
ls -la
ls -la airbyte-python-cdk || echo "No airbyte-python-cdk directory"
ls -laL ../airbyte-python-cdk || echo "No airbyte-python-cdk symlink"
- name: Docker login
id: docker-login
uses: docker/login-action@v3
Expand Down Expand Up @@ -186,11 +195,17 @@ runs:
shell: bash
run: tar cvzf ./dagger_engine_logs.tgz ./dagger_engine_logs

- name: Hash subcommand
id: hash-subcommand
shell: bash
if: always()
run: echo "subcommand_hash=$(echo ${{ inputs.subcommand }} | sha256sum | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT

- name: Upload logs to GitHub
id: upload-dagger-engine-logs
if: always()
uses: actions/upload-artifact@v4
with:
name: ${{ github.job }}_dagger_engine_logs.tgz
name: ${{ github.job }}_${{ steps.hash-subcommand.outputs.subcommand_hash }}_dagger_engine_logs.tgz
path: ./dagger_engine_logs.tgz
retention-days: 7
6 changes: 4 additions & 2 deletions .github/workflows/airbyte-ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ jobs:
- name: Install Poetry
id: install_poetry
uses: snok/install-poetry@v1
with:
version: 1.8.5

- name: Install Dependencies
id: install_dependencies
Expand All @@ -54,7 +56,7 @@ jobs:
working-directory: airbyte-ci/connectors/pipelines/
run: poetry run poe build-release-binary ${{ env.BINARY_FILE_NAME }}

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: airbyte-ci-${{ matrix.os }}-${{ steps.get_short_sha.outputs.sha }}
path: airbyte-ci/connectors/pipelines/dist/${{ env.BINARY_FILE_NAME }}
Expand Down Expand Up @@ -87,7 +89,7 @@ jobs:
if: github.ref == 'refs/heads/master'
working-directory: airbyte-ci/connectors/pipelines/
run: |
echo "::set-output name=version::$(poetry version --short)"
echo "version=$(poetry version --short)" >> $GITHUB_OUTPUT
- name: Authenticate to Google Cloud Prod
id: auth_prod
Expand Down
22 changes: 20 additions & 2 deletions .github/workflows/airbyte-ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- synchronize
jobs:
changes:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
internal_poetry_packages: ${{ steps.changes.outputs.internal_poetry_packages }}

Expand All @@ -42,7 +42,6 @@ jobs:
- airbyte-ci/connectors/erd/**
- airbyte-ci/connectors/metadata_service/lib/**
- airbyte-ci/connectors/metadata_service/orchestrator/**
- airbyte-cdk/python/**
- airbyte-integrations/bases/connector-acceptance-test/**
run-tests:
Expand All @@ -60,6 +59,25 @@ jobs:
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.ref }}
- name: Checkout Airbyte Python CDK
uses: actions/checkout@v4
with:
repository: airbytehq/airbyte-python-cdk
ref: main
# We can't clone into a parent directory of the repo, so we clone into
# a subdirectory and then move it over as a sibling directory.
# This will be used for the `--use-local-cdk` flag in `airbyte-ci` command
path: airbyte-python-cdk
- name: Move airbyte-python-cdk to sibling directory path
shell: bash
run: mv ./airbyte-python-cdk ../airbyte-python-cdk
- name: Show local paths checked out
shell: bash
run: |
set -x
echo "Current directory: $(pwd)"
ls -la
ls -la ../airbyte-python-cdk || echo "No airbyte-python-cdk directory"
- name: Extract branch name [WORKFLOW DISPATCH]
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/approve-and-merge-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
types: [created]
jobs:
approveAndMergeDispatch:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Auto Approve Slash Command Dispatch
uses: peter-evans/slash-command-dispatch@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/approve-regression-tests-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ run-name: "Approve Regression Tests #${{ github.event.inputs.pr }}"
jobs:
approve-regression-tests:
name: "Approve Regression Tests"
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Get job variables
id: job-vars
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/assign-issue-to-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:

jobs:
assign_one_project:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
name: Assign to Airbyte Github Project
steps:
- name: Assign documentation issues to the Documentation Roadmap project
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/auto_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
run_auto_merge:
name: Run auto-merge
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -18,6 +18,8 @@ jobs:
python-version: "3.10"
- name: Install and configure Poetry
uses: snok/install-poetry@v1
with:
version: 1.8.5
- name: Run auto merge
shell: bash
working-directory: airbyte-ci/connectors/auto_merge
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bump-version-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ concurrency:
jobs:
bump-version:
name: "Bump version of connectors in this PR"
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Get job variables
id: job-vars
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
- name: Check for changes
id: git-diff
run: |
git diff --quiet && echo "No changes to commit" || echo "::set-output name=changes::true"
git diff --quiet && echo "No changes to commit" || echo "changes=true" >> $GITHUB_OUTPUT
shell: bash

# Commit changes (if any)
Expand Down
Loading

0 comments on commit 71250f8

Please sign in to comment.