From 3bce6b3b10a7de1cfd8df052aae13ba18ff7ba28 Mon Sep 17 00:00:00 2001 From: Aaron Steers Date: Tue, 17 Dec 2024 15:41:13 -0800 Subject: [PATCH] ci: update format-fix --- .github/workflows/format-fix-command.yml | 27 ++++++++++++++---------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/format-fix-command.yml b/.github/workflows/format-fix-command.yml index 03988c66d38f..1c46f61c4010 100644 --- a/.github/workflows/format-fix-command.yml +++ b/.github/workflows/format-fix-command.yml @@ -29,8 +29,8 @@ concurrency: jobs: format-fix: - name: "Run airbyte-ci format fix all" - runs-on: ubuntu-latest + name: "Run pre-commit fix" + runs-on: ubuntu-24.04 steps: - name: Get job variables id: job-vars @@ -67,16 +67,21 @@ jobs: [1]: ${{ steps.job-vars.outputs.run-url }} - - name: Run airbyte-ci format fix all - uses: ./.github/actions/run-airbyte-ci - continue-on-error: true + # Compare the below to the `format_check.yml` workflow + - uses: actions/checkout@v4 + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: "zulu" + java-version: "21" + - name: Setup Python + uses: actions/setup-python@v5 with: - context: "manual" - gcs_credentials: ${{ secrets.METADATA_SERVICE_PROD_GCS_CREDENTIALS }} - sentry_dsn: ${{ secrets.SENTRY_AIRBYTE_CI_DSN }} - github_token: ${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }} - subcommand: "format fix all" - dagger_cloud_token: ${{ secrets.DAGGER_CLOUD_TOKEN_CACHE_2 }} + python-version: "3.10" + - name: Run pre-commit + uses: pre-commit/action@v3.0.1 + continue-on-error: true + id: format-fix # This is helpful in the case that we change a previously committed generated file to be ignored by git. - name: Remove any files that have been gitignored