diff --git a/.github/actions/install-airbyte-ci/action.yml b/.github/actions/install-airbyte-ci/action.yml index d0563331c805..f7646aa7e568 100644 --- a/.github/actions/install-airbyte-ci/action.yml +++ b/.github/actions/install-airbyte-ci/action.yml @@ -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 @@ -54,14 +59,15 @@ 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 @@ -69,6 +75,11 @@ runs: 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 diff --git a/.github/workflows/connectors_tests.yml b/.github/workflows/connectors_tests.yml index 4ff74942bab2..1262e36b85c1 100644 --- a/.github/workflows/connectors_tests.yml +++ b/.github/workflows/connectors_tests.yml @@ -78,7 +78,7 @@ jobs: # If the condition is not met the job will be skipped (it will not fail) if: (github.event_name == 'pull_request' && needs.changes.outputs.connectors == 'true' && github.event.pull_request.head.repo.fork != true) || github.event_name == 'workflow_dispatch' name: Connectors CI - runs-on: connector-test-large + runs-on: linux-20.04-large # Custom runner, defined in GitHub org settings timeout-minutes: 360 # 6 hours steps: - name: Checkout Airbyte diff --git a/.github/workflows/connectors_version_increment_check.yml b/.github/workflows/connectors_version_increment_check.yml index cd35b22de657..efb38521c3b8 100644 --- a/.github/workflows/connectors_version_increment_check.yml +++ b/.github/workflows/connectors_version_increment_check.yml @@ -21,7 +21,7 @@ on: jobs: connectors_ci: name: Connectors Version Increment Check - runs-on: connector-test-large + runs-on: linux-20.04-large # Custom runner, defined in GitHub org settings if: github.event.pull_request.head.repo.fork != true timeout-minutes: 22 steps: diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7081860cf9a4..b730e2f230e9 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -49,7 +49,7 @@ jobs: # Any revision upwards should be based on a performance analysis of gradle scans. # See https://github.com/airbytehq/airbyte/pull/36055 for an example of this, # which explains why which we went down from 64 cores to 16. - runs-on: connector-test-large + runs-on: linux-20.04-large # Custom runner, defined in GitHub org settings name: Gradle Check timeout-minutes: 30 steps: diff --git a/.github/workflows/live_tests.yml b/.github/workflows/live_tests.yml index cbe33c48b635..aa017eb3843c 100644 --- a/.github/workflows/live_tests.yml +++ b/.github/workflows/live_tests.yml @@ -44,7 +44,7 @@ on: jobs: live_tests: name: Live Tests - runs-on: connector-test-large + runs-on: linux-20.04-large # Custom runner, defined in GitHub org settings timeout-minutes: 360 # 6 hours steps: - name: Checkout Airbyte diff --git a/.github/workflows/publish-bulk-cdk.yml b/.github/workflows/publish-bulk-cdk.yml index a1ef1e716c85..2d89ac71a249 100644 --- a/.github/workflows/publish-bulk-cdk.yml +++ b/.github/workflows/publish-bulk-cdk.yml @@ -25,7 +25,7 @@ env: jobs: publish-bulk-cdk: name: Publish Bulk CDK - runs-on: connector-test-large + runs-on: linux-20.04-large # Custom runner, defined in GitHub org settings timeout-minutes: 30 steps: - name: Checkout Airbyte diff --git a/.github/workflows/publish-java-cdk-command.yml b/.github/workflows/publish-java-cdk-command.yml index 182cb2c59613..82a9ffac5636 100644 --- a/.github/workflows/publish-java-cdk-command.yml +++ b/.github/workflows/publish-java-cdk-command.yml @@ -61,7 +61,7 @@ env: jobs: publish-cdk: name: Publish Java CDK - runs-on: connector-test-large + runs-on: linux-20.04-large # Custom runner, defined in GitHub org settings timeout-minutes: 30 steps: - name: Link comment to Workflow Run diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 4bd5fd68bb4b..9008e5d0eae5 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -44,7 +44,7 @@ on: jobs: regression_tests: name: Regression Tests - runs-on: connector-test-large + runs-on: linux-20.04-large # Custom runner, defined in GitHub org settings timeout-minutes: 360 # 6 hours steps: - name: Checkout Airbyte