diff --git a/.github/actions/migration_tests/action.yml b/.github/actions/migration_tests/action.yml index 0198cbf472b0b..34951bac5ffe0 100644 --- a/.github/actions/migration_tests/action.yml +++ b/.github/actions/migration_tests/action.yml @@ -24,9 +24,9 @@ runs: - name: "Test migration file 2 to 3 migration: ${{env.BACKEND}}" shell: bash run: | - breeze shell "${{ env.AIRFLOW_2_CMD }}" --use-airflow-version 2.11.0 --answer y && - breeze shell "export AIRFLOW__DATABASE__EXTERNAL_DB_MANAGERS=${{env.DB_MANGERS}} - ${{ env.AIRFLOW_3_CMD }}" --no-db-cleanup + breeze shell "${AIRFLOW_2_CMD}" --use-airflow-version 2.11.0 --answer y && + breeze shell "export AIRFLOW__DATABASE__EXTERNAL_DB_MANAGERS=${DB_MANGERS} + ${AIRFLOW_3_CMD}" --no-db-cleanup env: COMPOSE_PROJECT_NAME: "docker-compose" DB_RESET: "false" @@ -47,9 +47,9 @@ runs: - name: "Test ORM migration 2 to 3: ${{env.BACKEND}}" shell: bash run: > - breeze shell "${{ env.AIRFLOW_2_CMD }}" --use-airflow-version 2.11.0 --answer y && - breeze shell "export AIRFLOW__DATABASE__EXTERNAL_DB_MANAGERS=${{env.DB_MANGERS}} - ${{ env.AIRFLOW_3_CMD }}" --no-db-cleanup + breeze shell "${AIRFLOW_2_CMD}" --use-airflow-version 2.11.0 --answer y && + breeze shell "export AIRFLOW__DATABASE__EXTERNAL_DB_MANAGERS=${DB_MANGERS} + ${AIRFLOW_3_CMD}" --no-db-cleanup env: COMPOSE_PROJECT_NAME: "docker-compose" DB_RESET: "false" @@ -69,7 +69,7 @@ runs: - name: "Test ORM migration ${{env.BACKEND}}" shell: bash run: > - breeze shell "export AIRFLOW__DATABASE__EXTERNAL_DB_MANAGERS=${{env.DB_MANAGERS}} && + breeze shell "export AIRFLOW__DATABASE__EXTERNAL_DB_MANAGERS=${DB_MANAGERS} && airflow db reset -y && airflow db migrate --to-revision heads && airflow db downgrade -n 2.7.0 -y && @@ -86,7 +86,7 @@ runs: shell: bash run: > breeze shell - "export AIRFLOW__DATABASE__EXTERNAL_DB_MANAGERS=${{env.DB_MANAGERS}} && + "export AIRFLOW__DATABASE__EXTERNAL_DB_MANAGERS=${DB_MANAGERS} && airflow db reset -y && airflow db downgrade -n 2.7.0 -y && airflow db migrate -s" diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index 59a326d49b1b6..bc23674f44285 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -267,6 +267,8 @@ jobs: skip-pre-commits: ${{ inputs.skip-pre-commits }} - name: "Autoupdate all pre-commits" run: pre-commit autoupdate + - name: "Autoupdate Lucas-C/pre-commit-hooks to bleeding edge" + run: pre-commit autoupdate --bleeding-edge --freeze --repo https://github.com/Lucas-C/pre-commit-hooks - name: "Run automated upgrade for black" run: > pre-commit run diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3dc226a64dfdd..3adeefd79b661 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -49,7 +49,8 @@ repos: - "--maxlevel" - "2" - repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.5.5 + # replace hash with version once PR #103 merged comes in a release + rev: abdd8b62891099da34162217ecb3872d22184a51 hooks: - id: insert-license name: Add license for all SQL files @@ -356,7 +357,7 @@ repos: - --skip=providers/.*/src/airflow/providers/*/*.rst,providers/*/docs/changelog.rst,docs/*/commits.rst,providers/*/docs/commits.rst,providers/*/*/docs/commits.rst,docs/apache-airflow/tutorial/pipeline_example.csv,*.min.js,*.lock,INTHEWILD.md,*.svg - --exclude-file=.codespellignorelines - repo: https://github.com/woodruffw/zizmor-pre-commit - rev: v1.7.0 + rev: v1.11.0 hooks: - id: zizmor name: Run zizmor to check for github workflow syntax errors