diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 53d193c4444..874da52cb75 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -94,39 +94,12 @@ jobs: # - run: | # echo '${{ toJSON(needs) }}' - # In case of self-hosted EC2 errors, remove this block. - start-platform-build-runner: - name: "Platform: Start Build EC2 Runner" - needs: - - changes - # Because scheduled builds on main require us to skip the changes job. Use always() to force this to run on main. - if: needs.changes.outputs.backend == 'true' || needs.changes.outputs.build == 'true' || (always() && github.ref == 'refs/heads/main') - timeout-minutes: 10 - runs-on: ubuntu-latest - outputs: - label: ${{ steps.start-ec2-runner.outputs.label }} - ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }} - steps: - - name: Checkout Airbyte - uses: actions/checkout@v3 - - name: Check PAT rate limits - run: | - ./tools/bin/find_non_rate_limited_PAT \ - ${{ secrets.GH_PAT_BUILD_RUNNER_OSS }} \ - ${{ secrets.GH_PAT_BUILD_RUNNER_BACKUP }} - - name: Start AWS Runner - id: start-ec2-runner - uses: ./.github/actions/start-aws-runner - with: - aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }} - github-token: ${{ env.PAT }} platform-build: name: "Platform: Build" - # In case of self-hosted EC2 errors, remove the next two lines and uncomment the currently commented out `runs-on` line. - needs: start-platform-build-runner # required to start the main job when the runner is ready - runs-on: ${{ needs.start-platform-build-runner.outputs.label }} # run the job on the newly created runner - timeout-minutes: 90 + # At the time of writing, using the beefier AWS runners made this step take 7 minutes instead of 10 minutes + # on the stock runners. Since no developer iteration loop depends on this, we use the stock gh runners. If + # we need to bring back the AWS runners, checkout 98f3e85a9ea2634298653642b18ac38fd1b85929 as a reference. + runs-on: ubuntu-latest steps: - name: Checkout Airbyte uses: actions/checkout@v3 @@ -187,39 +160,6 @@ jobs: # - name: Get Docker Space # run: docker run --rm busybox df -h - # In case of self-hosted EC2 errors, remove this block. - stop-platform-build-runner: - name: "Platform: Stop Build EC2 Runner" - timeout-minutes: 10 - needs: - - start-platform-build-runner # required to get output from the start-runner job - - platform-build # required to wait when the main job is done - runs-on: ubuntu-latest - # Always is required to stop the runner even if the previous job has errors. However always() runs even if the previous step is skipped. - # Thus, we check for skipped here. - if: ${{ always() && needs.start-platform-build-runner.result != 'skipped'}} - steps: - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-2 - - name: Checkout Airbyte - uses: actions/checkout@v3 - - name: Check PAT rate limits - run: | - ./tools/bin/find_non_rate_limited_PAT \ - ${{ secrets.GH_PAT_BUILD_RUNNER_OSS }} \ - ${{ secrets.GH_PAT_BUILD_RUNNER_BACKUP }} - - name: Stop EC2 runner - uses: airbytehq/ec2-github-runner@MSGv0.0.5 - with: - mode: stop - github-token: ${{ env.PAT }} - label: ${{ needs.start-platform-build-runner.outputs.label }} - ec2-instance-id: ${{ needs.start-platform-build-runner.outputs.ec2-instance-id }} - notify-failure-slack-channel: name: "Notify Slack Channel on Build Failures" runs-on: ubuntu-latest