Skip to content

Commit 2309535

Browse files
Merge branch 'master' into plugin-architecture-poc
2 parents 972c93d + 98b3512 commit 2309535

File tree

1,336 files changed

+65680
-54872
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,336 files changed

+65680
-54872
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
docker/**/*.sh text eol=lf
22
*.svg binary
33
*.ipynb binary
4+
*.geojson binary

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ body:
4141
label: Superset version
4242
options:
4343
- master / latest-dev
44+
- "5.0.0"
4445
- "4.1.2"
45-
- "4.0.2"
4646
validations:
4747
required: true
4848
- type: dropdown

.github/workflows/docker.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ jobs:
111111
docker compose up superset-init --exit-code-from superset-init
112112
113113
docker-compose-image-tag:
114+
# Run this job only on pushes to master (not for PRs)
115+
# goal is to check that building the latest image works, not required for all PR pushes
116+
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
114117
runs-on: ubuntu-24.04
115118
steps:
116119
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
@@ -134,4 +137,4 @@ jobs:
134137
if: steps.check.outputs.docker
135138
shell: bash
136139
run: |
137-
docker compose -f docker-compose-image-tag.yml up superset-init --exit-code-from superset-init
140+
docker compose -f compose-image-tag.yml up superset-init --exit-code-from superset-init

.github/workflows/pre-commit.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ jobs:
5353
cd docs
5454
yarn install --immutable
5555
56+
- name: Cache pre-commit environments
57+
uses: actions/cache@v3
58+
with:
59+
path: ~/.cache/pre-commit
60+
key: pre-commit-v2-${{ runner.os }}-py${{ matrix.python-version }}-${{ hashFiles('.pre-commit-config.yaml') }}
61+
restore-keys: |
62+
pre-commit-v2-${{ runner.os }}-py${{ matrix.python-version }}-
63+
5664
- name: pre-commit
5765
run: |
5866
set +e # Don't exit immediately on failure

.github/workflows/superset-e2e.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
with:
7474
persist-credentials: false
7575
submodules: recursive
76+
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
7677
- name: Checkout using ref (workflow_dispatch)
7778
if: github.event_name == 'workflow_dispatch' && github.event.inputs.ref != ''
7879
uses: actions/checkout@v4
@@ -137,9 +138,16 @@ jobs:
137138
NODE_OPTIONS: "--max-old-space-size=4096"
138139
with:
139140
run: cypress-run-all ${{ env.USE_DASHBOARD }} ${{ matrix.app_root }}
141+
- name: Set safe app root
142+
if: failure()
143+
id: set-safe-app-root
144+
run: |
145+
APP_ROOT="${{ matrix.app_root }}"
146+
SAFE_APP_ROOT=${APP_ROOT//\//_}
147+
echo "safe_app_root=$SAFE_APP_ROOT" >> $GITHUB_OUTPUT
140148
- name: Upload Artifacts
141149
uses: actions/upload-artifact@v4
142150
if: failure()
143151
with:
144152
path: ${{ github.workspace }}/superset-frontend/cypress-base/cypress/screenshots
145-
name: cypress-artifact-${{ github.run_id }}-${{ github.job }}-${{ matrix.browser }}-${{ matrix.parallel_id }}
153+
name: cypress-artifact-${{ github.run_id }}-${{ github.job }}-${{ matrix.browser }}-${{ matrix.parallel_id }}--${{ steps.set-safe-app-root.outputs.safe_app_root }}

.github/workflows/superset-frontend.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
uses: actions/checkout@v4
2727
with:
2828
persist-credentials: false
29+
fetch-depth: 0
30+
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
2931

3032
- name: Check for File Changes
3133
id: check
@@ -39,6 +41,10 @@ jobs:
3941
env:
4042
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4143
run: |
44+
echo "git rev-parse --short HEAD"
45+
git rev-parse --short HEAD
46+
echo "git show -s --format=raw HEAD"
47+
git show -s --format=raw HEAD
4248
docker buildx build \
4349
-t $TAG \
4450
--cache-from=type=registry,ref=apache/superset-cache:3.10-slim-bookworm \
@@ -115,24 +121,6 @@ jobs:
115121
files: merged-output/coverage-summary.json
116122
slug: apache/superset
117123

118-
core-cover:
119-
needs: frontend-build
120-
if: needs.frontend-build.outputs.should-run == 'true'
121-
runs-on: ubuntu-24.04
122-
steps:
123-
- name: Download Docker Image Artifact
124-
uses: actions/download-artifact@v4
125-
with:
126-
name: docker-image
127-
128-
- name: Load Docker Image
129-
run: docker load < docker-image.tar.gz
130-
131-
- name: superset-ui/core coverage
132-
run: |
133-
docker run --rm $TAG bash -c \
134-
"npm run core:cover"
135-
136124
lint-frontend:
137125
needs: frontend-build
138126
if: needs.frontend-build.outputs.should-run == 'true'
@@ -144,7 +132,8 @@ jobs:
144132
name: docker-image
145133

146134
- name: Load Docker Image
147-
run: docker load < docker-image.tar.gz
135+
run: |
136+
docker load < docker-image.tar.gz
148137
149138
- name: eslint
150139
run: |

.github/workflows/superset-python-presto-hive.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
run: sudo chown -R $USER:$USER /tmp/.superset
126126
- name: Start hadoop and hive
127127
if: steps.check.outputs.python
128-
run: docker compose -f scripts/databases/hive/docker-compose.yml up -d
128+
run: docker compose -f scripts/databases/hive/compose.yml up -d
129129
- name: Setup Python
130130
uses: ./.github/actions/setup-backend/
131131
if: steps.check.outputs.python

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ repos:
5858
- id: prettier
5959
additional_dependencies:
6060
61-
args: ["--ignore-path=./superset-frontend/.prettierignore"]
61+
args: ["--ignore-path=./superset-frontend/.prettierignore", "--exclude", "site-packages"]
6262
files: "superset-frontend"
6363
- repo: local
6464
hooks:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@ under the License.
4444
- [4.0.1](./CHANGELOG/4.0.1.md)
4545
- [4.0.2](./CHANGELOG/4.0.2.md)
4646
- [4.1.0](./CHANGELOG/4.1.0.md)
47+
- [5.0.0](./CHANGELOG/5.0.0.md)

0 commit comments

Comments
 (0)