This is an automated email from the ASF dual-hosted git repository. michaelsmolina pushed a commit to branch 4.0 in repository https://gitbox.apache.org/repos/asf/superset.git
commit 0baa2af200bae36aac69305665b19d1ef7f29492 Author: Michael S. Molina <[email protected]> AuthorDate: Wed Mar 6 12:23:07 2024 -0500 fix: Re-enable CI checks on release branches (#27390) (cherry picked from commit a54a24e3b5b9bd6a0e8aaeb0b58907038b1a5be4) --- .github/workflows/check_db_migration_confict.yml | 3 ++- .github/workflows/codeql-analysis.yml | 12 ++++++------ .github/workflows/docker.yml | 1 + .github/workflows/embedded-sdk-release.yml | 5 +++-- .github/workflows/generate-FOSSA-report.yml | 5 +++-- .github/workflows/pre-commit.yml | 3 ++- .github/workflows/prefer-typescript.yml | 3 ++- .github/workflows/release.yml | 3 ++- .github/workflows/superset-cli.yml | 7 ++++--- .github/workflows/superset-docs-deploy.yml | 3 ++- .github/workflows/superset-e2e.yml | 3 ++- .github/workflows/superset-frontend.yml | 1 + .github/workflows/superset-helm-release.yml | 1 + .github/workflows/superset-python-integrationtest.yml | 15 ++++++++------- .github/workflows/superset-python-misc.yml | 3 ++- .github/workflows/superset-python-presto-hive.yml | 11 ++++++----- .github/workflows/superset-python-unittest.yml | 9 +++++---- .github/workflows/superset-translations.yml | 5 +++-- .github/workflows/superset-websocket.yml | 3 ++- .github/workflows/tech-debt.yml | 5 +++-- 20 files changed, 60 insertions(+), 41 deletions(-) diff --git a/.github/workflows/check_db_migration_confict.yml b/.github/workflows/check_db_migration_confict.yml index 637252ab3b..079ba954ed 100644 --- a/.github/workflows/check_db_migration_confict.yml +++ b/.github/workflows/check_db_migration_confict.yml @@ -4,7 +4,8 @@ on: paths: - "superset/migrations/**" branches: - - 'master' + - "master" + - "[0-9].[0-9]" pull_request: paths: - "superset/migrations/**" diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 15193a195e..c200f9cb36 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,16 +2,16 @@ name: "CodeQL" on: push: - branches: [ "master" ] + branches: ["master", "[0-9].[0-9]"] paths: - - 'superset/**' + - "superset/**" pull_request: # The branches below must be a subset of the branches above - branches: [ "master" ] + branches: ["master"] paths: - - 'superset/**' + - "superset/**" schedule: - - cron: '0 4 * * *' + - cron: "0 4 * * *" # cancel previous workflow jobs for PRs concurrency: @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'python', 'javascript' ] + language: ["python", "javascript"] # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support steps: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1085c79f24..d02ad73265 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,6 +4,7 @@ on: push: branches: - "master" + - "[0-9].[0-9]" pull_request: branches: - "master" diff --git a/.github/workflows/embedded-sdk-release.yml b/.github/workflows/embedded-sdk-release.yml index 39ee461f6b..dcf7346e8f 100644 --- a/.github/workflows/embedded-sdk-release.yml +++ b/.github/workflows/embedded-sdk-release.yml @@ -3,7 +3,8 @@ name: Embedded SDK Release on: push: branches: - - 'master' + - "master" + - "[0-9].[0-9]" jobs: config: @@ -31,7 +32,7 @@ jobs: - uses: actions/setup-node@v4 with: node-version: "16" - registry-url: 'https://registry.npmjs.org' + registry-url: "https://registry.npmjs.org"; - run: npm ci - run: npm run ci:release env: diff --git a/.github/workflows/generate-FOSSA-report.yml b/.github/workflows/generate-FOSSA-report.yml index 5c7693459b..fb30d7dcc5 100644 --- a/.github/workflows/generate-FOSSA-report.yml +++ b/.github/workflows/generate-FOSSA-report.yml @@ -4,6 +4,7 @@ on: push: branches: - "master" + - "[0-9].[0-9]" jobs: config: @@ -33,8 +34,8 @@ jobs: - name: Setup Java uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: '11' + distribution: "temurin" + java-version: "11" - name: Generate fossa report env: FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }} diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 3e2c98970b..f9a3681ce0 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -3,7 +3,8 @@ name: pre-commit checks on: push: branches: - - 'master' + - "master" + - "[0-9].[0-9]" pull_request: types: [synchronize, opened, reopened, ready_for_review] diff --git a/.github/workflows/prefer-typescript.yml b/.github/workflows/prefer-typescript.yml index 51abea6f87..f3179d3bcc 100644 --- a/.github/workflows/prefer-typescript.yml +++ b/.github/workflows/prefer-typescript.yml @@ -3,7 +3,8 @@ name: Prefer TypeScript on: push: branches: - - 'master' + - "master" + - "[0-9].[0-9]" paths: - "superset-frontend/src/**" pull_request: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e504c93b49..bbf0d7ba2d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,8 @@ name: release-workflow on: push: branches: - - 'master' + - "master" + - "[0-9].[0-9]" jobs: config: diff --git a/.github/workflows/superset-cli.yml b/.github/workflows/superset-cli.yml index bfe3dedc18..9c52f36497 100644 --- a/.github/workflows/superset-cli.yml +++ b/.github/workflows/superset-cli.yml @@ -3,7 +3,8 @@ name: Superset CLI tests on: push: branches: - - 'master' + - "master" + - "[0-9].[0-9]" pull_request: types: [synchronize, opened, reopened, ready_for_review] @@ -55,8 +56,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'pip' - cache-dependency-path: 'requirements/testing.txt' + cache: "pip" + cache-dependency-path: "requirements/testing.txt" - name: Install dependencies if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies diff --git a/.github/workflows/superset-docs-deploy.yml b/.github/workflows/superset-docs-deploy.yml index aa733eba23..d8bcf7e644 100644 --- a/.github/workflows/superset-docs-deploy.yml +++ b/.github/workflows/superset-docs-deploy.yml @@ -6,6 +6,7 @@ on: - "docs/**" branches: - "master" + - "[0-9].[0-9]" jobs: config: @@ -38,7 +39,7 @@ jobs: - name: Set up Node.js 16 uses: actions/setup-node@v4 with: - node-version: '16' + node-version: "16" - name: yarn install run: | yarn install --check-cache diff --git a/.github/workflows/superset-e2e.yml b/.github/workflows/superset-e2e.yml index 3126b9a6a0..71b415ee6e 100644 --- a/.github/workflows/superset-e2e.yml +++ b/.github/workflows/superset-e2e.yml @@ -3,7 +3,8 @@ name: E2E on: push: branches: - - 'master' + - "master" + - "[0-9].[0-9]" pull_request: types: [synchronize, opened, reopened, ready_for_review] diff --git a/.github/workflows/superset-frontend.yml b/.github/workflows/superset-frontend.yml index 3ac99de33c..bce75a06bf 100644 --- a/.github/workflows/superset-frontend.yml +++ b/.github/workflows/superset-frontend.yml @@ -4,6 +4,7 @@ on: push: branches: - "master" + - "[0-9].[0-9]" paths: - "superset-frontend/**" pull_request: diff --git a/.github/workflows/superset-helm-release.yml b/.github/workflows/superset-helm-release.yml index b8db3d2186..fd60f82d49 100644 --- a/.github/workflows/superset-helm-release.yml +++ b/.github/workflows/superset-helm-release.yml @@ -4,6 +4,7 @@ on: push: branches: - "master" + - "[0-9].[0-9]" paths: - "helm/**" diff --git a/.github/workflows/superset-python-integrationtest.yml b/.github/workflows/superset-python-integrationtest.yml index 385edf89b5..6bf314d961 100644 --- a/.github/workflows/superset-python-integrationtest.yml +++ b/.github/workflows/superset-python-integrationtest.yml @@ -4,7 +4,8 @@ name: Python-Integration on: push: branches: - - 'master' + - "master" + - "[0-9].[0-9]" pull_request: types: [synchronize, opened, reopened, ready_for_review] @@ -54,8 +55,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'pip' - cache-dependency-path: 'requirements/testing.txt' + cache: "pip" + cache-dependency-path: "requirements/testing.txt" - name: Install dependencies if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies @@ -120,8 +121,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'pip' - cache-dependency-path: 'requirements/testing.txt' + cache: "pip" + cache-dependency-path: "requirements/testing.txt" - name: Install dependencies if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies @@ -180,8 +181,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'pip' - cache-dependency-path: 'requirements/testing.txt' + cache: "pip" + cache-dependency-path: "requirements/testing.txt" - name: Install dependencies if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies diff --git a/.github/workflows/superset-python-misc.yml b/.github/workflows/superset-python-misc.yml index eb5da6f18f..e05e05f48b 100644 --- a/.github/workflows/superset-python-misc.yml +++ b/.github/workflows/superset-python-misc.yml @@ -4,7 +4,8 @@ name: Python Misc on: push: branches: - - 'master' + - "master" + - "[0-9].[0-9]" paths: - "superset/**" pull_request: diff --git a/.github/workflows/superset-python-presto-hive.yml b/.github/workflows/superset-python-presto-hive.yml index 57d4e05414..af2c844057 100644 --- a/.github/workflows/superset-python-presto-hive.yml +++ b/.github/workflows/superset-python-presto-hive.yml @@ -4,7 +4,8 @@ name: Python Presto/Hive on: push: branches: - - 'master' + - "master" + - "[0-9].[0-9]" paths: - "superset/**" pull_request: @@ -70,8 +71,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'pip' - cache-dependency-path: 'requirements/testing.txt' + cache: "pip" + cache-dependency-path: "requirements/testing.txt" - name: Install dependencies if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies @@ -147,8 +148,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'pip' - cache-dependency-path: 'requirements/testing.txt' + cache: "pip" + cache-dependency-path: "requirements/testing.txt" - name: Install dependencies if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies diff --git a/.github/workflows/superset-python-unittest.yml b/.github/workflows/superset-python-unittest.yml index 548f128eac..330fa218ac 100644 --- a/.github/workflows/superset-python-unittest.yml +++ b/.github/workflows/superset-python-unittest.yml @@ -4,7 +4,8 @@ name: Python-Unit on: push: branches: - - 'master' + - "master" + - "[0-9].[0-9]" paths: - "superset/**" pull_request: @@ -43,9 +44,9 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'pip' - cache-dependency-path: 'requirements/testing.txt' -# TODO: separated requirements.txt file just for unit tests + cache: "pip" + cache-dependency-path: "requirements/testing.txt" + # TODO: separated requirements.txt file just for unit tests - name: Install dependencies if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies diff --git a/.github/workflows/superset-translations.yml b/.github/workflows/superset-translations.yml index 647e27b3d7..4a3d9cc21a 100644 --- a/.github/workflows/superset-translations.yml +++ b/.github/workflows/superset-translations.yml @@ -3,7 +3,8 @@ name: Translations on: push: branches: - - 'master' + - "master" + - "[0-9].[0-9]" pull_request: types: [synchronize, opened, reopened, ready_for_review] @@ -24,7 +25,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: '16' + node-version: "16" - name: Install dependencies uses: ./.github/actions/cached-dependencies with: diff --git a/.github/workflows/superset-websocket.yml b/.github/workflows/superset-websocket.yml index d0bf6f2f4e..c35573ada1 100644 --- a/.github/workflows/superset-websocket.yml +++ b/.github/workflows/superset-websocket.yml @@ -2,7 +2,8 @@ name: WebSocket server on: push: branches: - - 'master' + - "master" + - "[0-9].[0-9]" paths: - "superset-websocket/**" pull_request: diff --git a/.github/workflows/tech-debt.yml b/.github/workflows/tech-debt.yml index ccbf0ba181..1c6a9edd46 100644 --- a/.github/workflows/tech-debt.yml +++ b/.github/workflows/tech-debt.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - "[0-9].[0-9]" jobs: config: @@ -31,7 +32,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: '16' + node-version: "16" - name: Install Dependencies run: npm install @@ -39,7 +40,7 @@ jobs: - name: Run Script env: - SPREADSHEET_ID: '1oABNnzxJYzwUrHjr_c9wfYEq9dFL1ScVof9LlaAdxvo' + SPREADSHEET_ID: "1oABNnzxJYzwUrHjr_c9wfYEq9dFL1ScVof9LlaAdxvo" SERVICE_ACCOUNT_KEY: ${{ secrets.GSHEET_KEY }} run: npm run lint-stats continue-on-error: true
