diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7bc8e02fe00..97d8099cf93 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,47 +1,82 @@ [bumpversion] -current_version = 0.50.24 commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-[a-z]+)? serialize = {major}.{minor}.{patch} -[bumpversion:file:.bumpversion.cfg] - [bumpversion:file:.env] +search = VERSION=dev +replace = VERSION={new_version} [bumpversion:file:airbyte-container-orchestrator/Dockerfile] +search = ARG VERSION=dev +replace = ARG VERSION={new_version} [bumpversion:file:airbyte-proxy/Dockerfile] +search = ARG VERSION=dev +replace = ARG VERSION={new_version} [bumpversion:file:airbyte-server/Dockerfile] +search = ARG VERSION=dev +replace = ARG VERSION={new_version} + +[bumpversion:file:airbyte-connector-builder-server/Dockerfile] +search = ARG VERSION=dev +replace = ARG VERSION={new_version} [bumpversion:file:charts/airbyte-bootloader/Chart.yaml] +search = appVersion: dev +replace = appVersion: {new_version} [bumpversion:file:charts/airbyte-cron/Chart.yaml] +search = appVersion: dev +replace = appVersion: {new_version} [bumpversion:file:charts/airbyte-metrics/Chart.yaml] +search = appVersion: dev +replace = appVersion: {new_version} [bumpversion:file:charts/airbyte-pod-sweeper/Chart.yaml] +search = appVersion: dev +replace = appVersion: {new_version} [bumpversion:file:charts/airbyte-server/Chart.yaml] +search = appVersion: dev +replace = appVersion: {new_version} [bumpversion:file:charts/airbyte-temporal/Chart.yaml] +search = appVersion: dev +replace = appVersion: {new_version} [bumpversion:file:charts/airbyte-webapp/Chart.yaml] +search = appVersion: dev +replace = appVersion: {new_version} [bumpversion:file:charts/airbyte-worker/Chart.yaml] +search = appVersion: dev +replace = appVersion: {new_version} [bumpversion:file:charts/airbyte/Chart.yaml] +search = appVersion: dev +replace = appVersion: {new_version} [bumpversion:file:charts/airbyte-connector-builder-server/Chart.yaml] - -[bumpversion:file:charts/airbyte/README.md] - -[bumpversion:file:airbyte-connector-builder-server/Dockerfile] +search = appVersion: dev +replace = appVersion: {new_version} [bumpversion:file:charts/airbyte-keycloak/Chart.yaml] +search = appVersion: dev +replace = appVersion: {new_version} [bumpversion:file:charts/airbyte-keycloak-setup/Chart.yaml] +search = appVersion: dev +replace = appVersion: {new_version} [bumpversion:file:charts/airbyte-api-server/Chart.yaml] +search = appVersion: dev +replace = appVersion: {new_version} + +[bumpversion:file:charts/airbyte/README.md] +search = ![appVersion: dev](https://img.shields.io/badge/AppVersion-dev-informational?style=flat-square) +replace = ![appVersion: {new_version}](https://img.shields.io/badge/AppVersion-{new_version}-informational?style=flat-square) diff --git a/.env b/.env index de28947e9be..980c57ad3b9 100644 --- a/.env +++ b/.env @@ -10,7 +10,7 @@ ### SHARED ### -VERSION=0.50.24 +VERSION=dev # When using the airbyte-db via default docker image CONFIG_ROOT=/data diff --git a/airbyte-connector-builder-server/Dockerfile b/airbyte-connector-builder-server/Dockerfile index 79e04ff511d..680bc610d75 100644 --- a/airbyte-connector-builder-server/Dockerfile +++ b/airbyte-connector-builder-server/Dockerfile @@ -10,7 +10,7 @@ ENV PIP=${PYENV_ROOT}/versions/${PYTHON_VERSION}/bin/pip COPY requirements.txt requirements.txt RUN ${PIP} install -r requirements.txt -ARG VERSION=0.50.24 +ARG VERSION=dev ENV APPLICATION airbyte-connector-builder-server ENV VERSION ${VERSION} @@ -23,5 +23,5 @@ ADD airbyte-app.tar /app # wait for upstream dependencies to become available before starting server ENTRYPOINT ["/bin/bash", "-c", "airbyte-app/bin/${APPLICATION}"] -LABEL io.airbyte.version=0.50.24 -LABEL io.airbyte.name=airbyte/connector-builder-server \ No newline at end of file +LABEL io.airbyte.version=${VERSION} +LABEL io.airbyte.name=airbyte/connector-builder-server diff --git a/airbyte-container-orchestrator/Dockerfile b/airbyte-container-orchestrator/Dockerfile index 633d9fae785..fdfe338daa6 100644 --- a/airbyte-container-orchestrator/Dockerfile +++ b/airbyte-container-orchestrator/Dockerfile @@ -10,7 +10,7 @@ RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/s && chmod +x kubectl && mv kubectl /usr/local/bin/ # Don't change this manually. Bump version expects to make moves based on this string -ARG VERSION=0.50.24 +ARG VERSION=dev ENV APPLICATION airbyte-container-orchestrator ENV VERSION=${VERSION} diff --git a/airbyte-proxy/Dockerfile b/airbyte-proxy/Dockerfile index 4542e765f64..77d7a247215 100644 --- a/airbyte-proxy/Dockerfile +++ b/airbyte-proxy/Dockerfile @@ -2,7 +2,7 @@ FROM nginx:latest -ARG VERSION=0.50.24 +ARG VERSION=dev ENV APPLICATION airbyte-proxy ENV VERSION ${VERSION} diff --git a/airbyte-server/Dockerfile b/airbyte-server/Dockerfile index 4bdb76fb63e..1661a8a71c2 100644 --- a/airbyte-server/Dockerfile +++ b/airbyte-server/Dockerfile @@ -3,7 +3,7 @@ FROM ${JDK_IMAGE} AS server EXPOSE 8000 5005 -ARG VERSION=0.50.24 +ARG VERSION=dev ENV APPLICATION airbyte-server ENV VERSION ${VERSION} diff --git a/charts/airbyte-api-server/Chart.yaml b/charts/airbyte-api-server/Chart.yaml index 979b7c9784d..4766c754b6e 100644 --- a/charts/airbyte-api-server/Chart.yaml +++ b/charts/airbyte-api-server/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common diff --git a/charts/airbyte-bootloader/Chart.yaml b/charts/airbyte-bootloader/Chart.yaml index 428819a1a2c..83ff38bed1d 100644 --- a/charts/airbyte-bootloader/Chart.yaml +++ b/charts/airbyte-bootloader/Chart.yaml @@ -15,14 +15,14 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common diff --git a/charts/airbyte-connector-builder-server/Chart.yaml b/charts/airbyte-connector-builder-server/Chart.yaml index 67ffe9ef26f..a1e921e43e5 100644 --- a/charts/airbyte-connector-builder-server/Chart.yaml +++ b/charts/airbyte-connector-builder-server/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common diff --git a/charts/airbyte-cron/Chart.yaml b/charts/airbyte-cron/Chart.yaml index c247333032d..12444fd33f6 100644 --- a/charts/airbyte-cron/Chart.yaml +++ b/charts/airbyte-cron/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common diff --git a/charts/airbyte-keycloak-setup/Chart.yaml b/charts/airbyte-keycloak-setup/Chart.yaml index b1891f74783..0c362e47de4 100644 --- a/charts/airbyte-keycloak-setup/Chart.yaml +++ b/charts/airbyte-keycloak-setup/Chart.yaml @@ -15,18 +15,18 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common repository: https://charts.bitnami.com/bitnami tags: - bitnami-common - version: 1.x.x \ No newline at end of file + version: 1.x.x diff --git a/charts/airbyte-keycloak/Chart.yaml b/charts/airbyte-keycloak/Chart.yaml index e8abb6f1cbf..edb543262f1 100644 --- a/charts/airbyte-keycloak/Chart.yaml +++ b/charts/airbyte-keycloak/Chart.yaml @@ -15,18 +15,18 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common repository: https://charts.bitnami.com/bitnami tags: - bitnami-common - version: 1.x.x \ No newline at end of file + version: 1.x.x diff --git a/charts/airbyte-metrics/Chart.yaml b/charts/airbyte-metrics/Chart.yaml index 08566d418df..17abf288666 100644 --- a/charts/airbyte-metrics/Chart.yaml +++ b/charts/airbyte-metrics/Chart.yaml @@ -15,14 +15,14 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common diff --git a/charts/airbyte-pod-sweeper/Chart.yaml b/charts/airbyte-pod-sweeper/Chart.yaml index f26dd1d5589..96e94e9d77a 100644 --- a/charts/airbyte-pod-sweeper/Chart.yaml +++ b/charts/airbyte-pod-sweeper/Chart.yaml @@ -15,14 +15,14 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common diff --git a/charts/airbyte-server/Chart.yaml b/charts/airbyte-server/Chart.yaml index ded18696c7e..f1c8469b8c3 100644 --- a/charts/airbyte-server/Chart.yaml +++ b/charts/airbyte-server/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common diff --git a/charts/airbyte-temporal/Chart.yaml b/charts/airbyte-temporal/Chart.yaml index a4dc8fe4580..226a62164ca 100644 --- a/charts/airbyte-temporal/Chart.yaml +++ b/charts/airbyte-temporal/Chart.yaml @@ -15,14 +15,14 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common diff --git a/charts/airbyte-webapp/Chart.yaml b/charts/airbyte-webapp/Chart.yaml index 506ce05e54b..c5a7f33b131 100644 --- a/charts/airbyte-webapp/Chart.yaml +++ b/charts/airbyte-webapp/Chart.yaml @@ -15,14 +15,14 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common diff --git a/charts/airbyte-worker/Chart.yaml b/charts/airbyte-worker/Chart.yaml index 5936e974af9..69f4efc8955 100644 --- a/charts/airbyte-worker/Chart.yaml +++ b/charts/airbyte-worker/Chart.yaml @@ -15,14 +15,14 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common diff --git a/charts/airbyte/Chart.lock b/charts/airbyte/Chart.lock index 869ba502171..9dbda671fb3 100644 --- a/charts/airbyte/Chart.lock +++ b/charts/airbyte/Chart.lock @@ -4,39 +4,39 @@ dependencies: version: 1.17.1 - name: airbyte-bootloader repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - name: temporal repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - name: webapp repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - name: server repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - name: airbyte-api-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - name: worker repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - name: pod-sweeper repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - name: metrics repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - name: cron repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - name: connector-builder-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - name: keycloak repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - name: keycloak-setup repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 -digest: sha256:d7a814247ae1fc194fbdc2807ae114f06ae80ea68a626256fa25c2fdd5a9bfe7 -generated: "2023-09-01T19:19:52.389785043Z" + version: 0.48.8 +digest: sha256:6e736e04dd6da520859db8e5b450971cea7d80fc0d629c293cb38fb063447cc0 +generated: "2023-09-01T22:33:22.735182715Z" diff --git a/charts/airbyte/Chart.yaml b/charts/airbyte/Chart.yaml index 58e0c936cda..efa4ecae087 100644 --- a/charts/airbyte/Chart.yaml +++ b/charts/airbyte/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.48.6 +version: 0.48.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.50.24 +appVersion: dev dependencies: - name: common @@ -32,48 +32,48 @@ dependencies: - condition: airbyte-bootloader.enabled name: airbyte-bootloader repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - condition: temporal.enabled name: temporal repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - condition: webapp.enabled name: webapp repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - condition: server.enabled name: server repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - condition: airbyte-api-server.enabled name: airbyte-api-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - condition: worker.enabled name: worker repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - condition: pod-sweeper.enabled name: pod-sweeper repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - condition: metrics.enabled name: metrics repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - condition: cron.enabled name: cron repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - condition: connector-builder-server.enabled name: connector-builder-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - condition: keycloak.enabled name: keycloak repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 + version: 0.48.8 - condition: keycloak-setup.enabled name: keycloak-setup repository: https://airbytehq.github.io/helm-charts/ - version: 0.48.6 \ No newline at end of file + version: 0.48.8 diff --git a/charts/airbyte/README.md b/charts/airbyte/README.md index e87bc3d30de..f9df04ca652 100644 --- a/charts/airbyte/README.md +++ b/charts/airbyte/README.md @@ -1,6 +1,8 @@ # airbyte -![Version: 0.50.24](https://img.shields.io/badge/Version-0.50.24-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.50.24](https://img.shields.io/badge/AppVersion-0.50.24-informational?style=flat-square) +![Version: 0.50.24](https://img.shields.io/badge/Version-0.50.24-informational?style=flat-square) +![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![appVersion: dev](https://img.shields.io/badge/AppVersion-dev-informational?style=flat-square) Helm chart to deploy airbyte diff --git a/tools/bin/bump_version.sh b/tools/bin/bump_version.sh index 56aeb95271d..511e9997f9e 100755 --- a/tools/bin/bump_version.sh +++ b/tools/bin/bump_version.sh @@ -1,33 +1,19 @@ #!/usr/bin/env bash set -eu -# If running in a tty (TeleTYpe AKA interactive) shell -# complain because this is supposed to be run in the sky without interactive shell -if ! test "$(tty)" == "not a tty"; then - echo "Ahoy There! This Script is meant to run as a GH action" - exit 1 -fi - set -o xtrace REPO=$(git ls-remote --get-url | xargs basename -s .git) echo $REPO -if [ "$REPO" == "airbyte" ]; then - PREV_VERSION=$(grep -w 'VERSION=[0-9]\+\(\.[0-9]\+\)\+' run-ab-platform.sh | cut -d"=" -f2) - echo "Bumping version for Airbyte" -else - PREV_VERSION=$(grep -w VERSION .env | cut -d"=" -f2) - echo "Bumping version for Airbyte Platform" -fi GIT_REVISION=$(git rev-parse HEAD) pip install bumpversion if [ -z "${OVERRIDE_VERSION:-}" ]; then # No override, so bump the version normally - bumpversion "$PART_TO_BUMP" + bumpversion --current-version "$PREV_VERSION" "$PART_TO_BUMP" else # We have an override version, so use it directly - bumpversion --current-version $PREV_VERSION --new-version $OVERRIDE_VERSION "$PART_TO_BUMP" + bumpversion --current-version "$PREV_VERSION" --new-version $OVERRIDE_VERSION "$PART_TO_BUMP" fi if [ "$REPO" == "airbyte" ]; then @@ -44,4 +30,3 @@ set +o xtrace echo "Bumped version from ${PREV_VERSION} to ${NEW_VERSION}" echo "PREV_VERSION=${PREV_VERSION}" >> $GITHUB_OUTPUT echo "NEW_VERSION=${NEW_VERSION}" >> $GITHUB_OUTPUT -echo "GIT_REVISION=${GIT_REVISION}" >> $GITHUB_OUTPUT