Skip to content

Commit

Permalink
Merge branch 'airbytehq:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jmmizerany authored Feb 26, 2024
2 parents e5adcb0 + f509404 commit 4256a22
Show file tree
Hide file tree
Showing 405 changed files with 22,252 additions and 8,794 deletions.
4 changes: 1 addition & 3 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.50.50
current_version = 0.50.53
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
Expand All @@ -10,6 +10,4 @@ serialize =

[bumpversion:file:gradle.properties]

[bumpversion:file:docs/operator-guides/upgrading-airbyte.md]

[bumpversion:file:run-ab-platform.sh]
30 changes: 29 additions & 1 deletion .github/workflows/airbyte-ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,35 @@ on:
- reopened
- synchronize
jobs:
run-airbyte-ci-poetry-ci:
changes:
runs-on: ubuntu-latest
outputs:
internal_poetry_packages: ${{ steps.changes.outputs.internal_poetry_packages }}

steps:
- name: Checkout Airbyte
if: github.event_name != 'pull_request'
uses: actions/checkout@v3
- id: changes
uses: dorny/paths-filter@v2
with:
# Note: expressions within a filter are OR'ed
filters: |
internal_poetry_packages:
- airbyte-lib/**
- airbyte-ci/connectors/pipelines/**
- airbyte-ci/connectors/base_images/**
- airbyte-ci/connectors/common_utils/**
- airbyte-ci/connectors/connector_ops/**
- airbyte-ci/connectors/connectors_qa/**
- airbyte-ci/connectors/ci_credentials/**
- airbyte-ci/connectors/metadata_service/lib/**
- airbyte-ci/connectors/metadata_service/orchestrator/**
- airbyte-integrations/bases/connector-acceptance-test/**
run-tests:
needs: changes
if: needs.changes.outputs.internal_poetry_packages == 'true'
#name: Internal Poetry packages CI
# To rename in a follow up PR
name: Run Airbyte CI tests
Expand Down
28 changes: 0 additions & 28 deletions .github/workflows/connector_metadata_checks.yml

This file was deleted.

38 changes: 38 additions & 0 deletions .github/workflows/connectors_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,45 @@ on:
- opened
- synchronize
jobs:
changes:
runs-on: ubuntu-latest
outputs:
connectors: ${{ steps.changes.outputs.connectors }}
permissions:
statuses: write
steps:
- name: Checkout Airbyte
if: github.event_name != 'pull_request'
uses: actions/checkout@v3
- id: changes
uses: dorny/paths-filter@v2
with:
# Note: expressions within a filter are OR'ed
filters: |
connectors:
- '*'
- 'airbyte-ci/**/*'
- 'airbyte-integrations/connectors/**/*'
- 'airbyte-cdk/**/*'
- 'buildSrc/**/*'
# The Connector CI Tests is a status check emitted by airbyte-ci
# We make it pass once we have determined that there are no changes to the connectors
- name: "Skip Connectors CI tests"
if: steps.changes.outputs.connectors != 'true' && github.event_name == 'pull_request'
run: |
curl --request POST \
--url https://api.github.com/repos/${{ github.repository }}/statuses/${{ github.event.pull_request.head.sha }} \
--header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
--header 'content-type: application/json' \
--data '{
"state": "success",
"context": "Connectors CI tests",
"target_url": "${{ github.event.workflow_run.html_url }}"
}' \
connectors_ci:
needs: changes
if: needs.changes.outputs.connectors == 'true'
name: Connectors CI
runs-on: connector-test-large
timeout-minutes: 1440 # 24 hours
Expand Down
57 changes: 26 additions & 31 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,29 @@ on:
- synchronize

jobs:
changes:
runs-on: ubuntu-latest
outputs:
java: ${{ steps.changes.outputs.java }}

steps:
- name: Checkout Airbyte
if: github.event_name != 'pull_request'
uses: actions/checkout@v3
- id: changes
uses: dorny/paths-filter@v2
with:
# Note: expressions within a filter are OR'ed
filters: |
java:
- '**/*.java'
- '**/*.gradle'
- 'airbyte-cdk/java/**/*'
run-check:
needs:
- changes
if: needs.changes.outputs.java == 'true'
# The gradle check task which we will run is embarrassingly parallelizable.
# We therefore run this on a machine with a maximum number of cores.
# We pay per time and per core, so there should be little difference in total cost.
Expand All @@ -31,58 +53,31 @@ jobs:
steps:
- name: Checkout Airbyte
uses: actions/checkout@v3
# IMPORTANT! This is necessary to make sure that a status is reported on the PR
# even if the workflow is skipped. If we used github actions filters, the workflow
# would not be reported as skipped, but instead would be forever pending.
#
# I KNOW THIS SOUNDS CRAZY, BUT IT IS TRUE.
#
# Also it gets worse
#
# IMPORTANT! DO NOT CHANGE THE QUOTES AROUND THE GLOBS. THEY ARE REQUIRED.
# MAKE SURE TO TEST ANY SYNTAX CHANGES BEFORE MERGING.
- name: Get changed files
uses: tj-actions/changed-files@v39
id: changes
with:
# Include java connectors and java CDK.
# Adding all *.java and *.gradle files gets us most of the way there.
# We're take a bit more strict for the java CDK, to make sure that
# the tests run when they should, for instance when changing the contents
# of a text file used as a resource.
files_yaml: |
gradlecheck:
- '**/*.java'
- '**/*.gradle'
- 'airbyte-cdk/java/**/*'
- uses: actions/setup-java@v3
if: steps.changes.outputs.gradlecheck_any_changed == 'true'
with:
distribution: "zulu"
java-version: "21"
- name: Install Pip
if: steps.changes.outputs.gradlecheck_any_changed == 'true'
run: curl -fsSL https://bootstrap.pypa.io/get-pip.py | python3
- name: Install Pyenv
if: steps.changes.outputs.gradlecheck_any_changed == 'true'
run: python3 -m pip install virtualenv --user
- name: Docker login
if: steps.changes.outputs.gradlecheck_any_changed == 'true'
# Some tests use testcontainers which pull images from DockerHub.
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: Run Gradle Check
if: steps.changes.outputs.gradlecheck_any_changed == 'true'
uses: burrunan/gradle-cache-action@v1
env:
CI: true
with:
job-id: gradle-check
read-only: ${{ github.ref != 'refs/heads/master' }}
gradle-distribution-sha-256-sum-warning: false
concurrent: true
# TODO: be able to remove the skipSlowTests property
arguments: --scan --no-daemon --no-watch-fs check -DskipSlowTests=true
arguments: --scan check -DskipSlowTests=true

set-instatus-incident-on-failure:
name: Create Instatus Incident on Failure
Expand Down
Loading

0 comments on commit 4256a22

Please sign in to comment.