Skip to content

Commit

Permalink
fix: Re-enable CI checks on release branches (apache#27390)
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-s-molina authored Mar 6, 2024
1 parent 5107cc0 commit a54a24e
Show file tree
Hide file tree
Showing 20 changed files with 60 additions and 41 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/check_db_migration_confict.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ on:
paths:
- "superset/migrations/**"
branches:
- 'master'
- "master"
- "[0-9].[0-9]"
pull_request:
paths:
- "superset/migrations/**"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- "master"
- "[0-9].[0-9]"
pull_request:
branches:
- "master"
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/embedded-sdk-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: Embedded SDK Release
on:
push:
branches:
- 'master'
- "master"
- "[0-9].[0-9]"

jobs:
config:
Expand Down Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/generate-FOSSA-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- "master"
- "[0-9].[0-9]"

jobs:
config:
Expand Down Expand Up @@ -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 }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/prefer-typescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: Prefer TypeScript
on:
push:
branches:
- 'master'
- "master"
- "[0-9].[0-9]"
paths:
- "superset-frontend/src/**"
pull_request:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: release-workflow
on:
push:
branches:
- 'master'
- "master"
- "[0-9].[0-9]"

jobs:
config:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/superset-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/superset-docs-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- "docs/**"
branches:
- "master"
- "[0-9].[0-9]"

jobs:
config:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/superset-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: E2E
on:
push:
branches:
- 'master'
- "master"
- "[0-9].[0-9]"
pull_request:
types: [synchronize, opened, reopened, ready_for_review]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/superset-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- "master"
- "[0-9].[0-9]"
paths:
- "superset-frontend/**"
pull_request:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/superset-helm-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- "master"
- "[0-9].[0-9]"
paths:
- "helm/**"

Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/superset-python-integrationtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/superset-python-misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ name: Python Misc
on:
push:
branches:
- 'master'
- "master"
- "[0-9].[0-9]"
paths:
- "superset/**"
pull_request:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/superset-python-presto-hive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ name: Python Presto/Hive
on:
push:
branches:
- 'master'
- "master"
- "[0-9].[0-9]"
paths:
- "superset/**"
pull_request:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/superset-python-unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ name: Python-Unit
on:
push:
branches:
- 'master'
- "master"
- "[0-9].[0-9]"
paths:
- "superset/**"
- "requirements/**"
Expand Down Expand Up @@ -49,9 +50,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
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/superset-translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: Translations
on:
push:
branches:
- 'master'
- "master"
- "[0-9].[0-9]"
pull_request:
types: [synchronize, opened, reopened, ready_for_review]

Expand All @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/superset-websocket.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: WebSocket server
on:
push:
branches:
- 'master'
- "master"
- "[0-9].[0-9]"
paths:
- "superset-websocket/**"
pull_request:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/tech-debt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- master
- "[0-9].[0-9]"

jobs:
config:
Expand Down Expand Up @@ -31,15 +32,15 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: "16"

- name: Install Dependencies
run: npm install
working-directory: ./superset-frontend

- 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
Expand Down

0 comments on commit a54a24e

Please sign in to comment.