fix(ci): stop superseded Docs Deployment runs from showing as cancelled

Bursty pushes to master can trigger several overlapping Docs Deployment
attempts. The docs-deploy-asf-site concurrency group correctly serializes
the actual builds (needed to avoid racing on the final push to
superset-site), but every superseded attempt gets force-killed with a
`cancelled` conclusion, which reads as a red/failing check on that commit
even though nothing is actually broken.

Add a check-freshness job that runs outside the concurrency group and
compares its own commit against master's live tip. Superseded runs now
skip cleanly instead of entering (and being cancelled out of) the
serialized build-deploy job, so only genuine push races still rely on
cancel-in-progress as a backstop.

.github/workflows/bump-python-package.yml

@@ -40,7 +40,7 @@ jobs:
         uses: ./.github/actions/setup-supersetbot/
 
       - name: Set up Python ${{ inputs.python-version }}
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: "3.11"
 

.github/workflows/superset-docs-deploy.yml

@@ -18,16 +18,6 @@ on:
 
   workflow_dispatch: {}
 
-# Serialize deploys: the action pushes to apache/superset-site without
-# rebasing, so concurrent runs race on the final push and the loser fails
-# with `! [rejected] asf-site -> asf-site (fetch first)`. Cancel any
-# in-progress run as soon as a newer one starts — the destination repo
-# isn't touched until the final push step, so canceling mid-build is safe,
-# and the freshest content always wins.
-concurrency:
-  group: docs-deploy-asf-site
-  cancel-in-progress: true
-
 permissions:
   contents: read
 
@@ -47,17 +37,59 @@ jobs:
 
         env:
           SUPERSET_SITE_BUILD: ${{ (secrets.SUPERSET_SITE_BUILD != '' && secrets.SUPERSET_SITE_BUILD != '') || '' }}
+
+  # Master gets frequent, sometimes bursty pushes, and each one can trigger a
+  # deploy attempt. Rather than let every superseded attempt get force-killed
+  # by the build-deploy concurrency group below (which shows up as a
+  # `cancelled` — i.e. red/failing-looking — check on that commit), have each
+  # run check up front whether it's still building master's current tip and,
+  # if not, skip cleanly. Deliberately outside the docs-deploy-asf-site
+  # concurrency group so it runs immediately for every trigger without
+  # blocking or being blocked by anything.
+  check-freshness:
+    runs-on: ubuntu-26.04
+    outputs:
+      is-current: ${{ steps.check.outputs.is-current }}
+    steps:
+      - name: "Check whether this is still master's current commit"
+        id: check
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BUILD_SHA: ${{ github.event.workflow_run.head_sha || github.sha }}
+        run: |
+          latest_sha="$(gh api "repos/${{ github.repository }}/commits/master" --jq .sha)"
+          if [ "${latest_sha}" = "${BUILD_SHA}" ]; then
+            echo "is-current=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "is-current=false" >> "$GITHUB_OUTPUT"
+            echo "::notice::master has moved on to ${latest_sha} since ${BUILD_SHA} was triggered — a newer run will deploy it, so skipping this one."
+          fi
+
   build-deploy:
-    needs: config
+    needs: [config, check-freshness]
+    # Only the run for master's current tip proceeds; anything superseded
+    # already skipped at check-freshness above instead of landing here.
     # For workflow_run triggers, only deploy when the triggering run originated
     # from this repository (not a fork), ensuring the checked-out code and any
     # local actions executed with deploy credentials are trusted.
     if: >-
       needs.config.outputs.has-secrets &&
+      needs.check-freshness.outputs.is-current == 'true' &&
       (github.event_name != 'workflow_run' ||
        github.event.workflow_run.head_repository.full_name == github.repository)
     name: Build & Deploy
     runs-on: ubuntu-26.04
+    # Serialize deploys: the action pushes to apache/superset-site without
+    # rebasing, so concurrent runs race on the final push and the loser fails
+    # with `! [rejected] asf-site -> asf-site (fetch first)`. Cancel any
+    # in-progress run as soon as a newer one starts — the destination repo
+    # isn't touched until the final push step, so canceling mid-build is safe,
+    # and the freshest content always wins. The check-freshness gate above
+    # means it should be rare for more than one run to reach this point, but
+    # this stays as a backstop against the actual push race.
+    concurrency:
+      group: docs-deploy-asf-site
+      cancel-in-progress: true
     steps:
       - name: "Checkout ${{ github.event.workflow_run.head_sha || github.sha }}"
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

.github/workflows/superset-frontend.yml

@@ -122,25 +122,13 @@ jobs:
           pattern: coverage-artifacts-*
           path: coverage/
 
-      - name: Reorganize test result reports
-        run: |
-          find coverage/
-          for i in {1..8}; do
-            mv coverage/coverage-artifacts-${i}/coverage-final.json coverage/coverage-shard-${i}.json
-          done
-        shell: bash
-
-      - name: Merge Code Coverage
-        run: npx nyc merge coverage/ merged-output/coverage-summary.json
-
       - name: Upload Code Coverage
         uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         with:
           flags: javascript
           use_oidc: true
           verbose: true
-          disable_search: true
-          files: merged-output/coverage-summary.json
+          directory: coverage
           slug: apache/superset
 
   lint-frontend:

docs/package.json

@@ -54,7 +54,7 @@
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.14.1",
     "@fontsource/fira-code": "^5.3.0",
-    "@fontsource/ibm-plex-mono": "^5.2.7",
+    "@fontsource/ibm-plex-mono": "^5.3.0",
     "@fontsource/inter": "^5.3.0",
     "@mdx-js/react": "^3.1.1",
     "@saucelabs/theme-github-codeblock": "^0.3.0",

docs/yarn.lock

@@ -2534,10 +2534,10 @@
   resolved "https://registry.yarnpkg.com/@fontsource/fira-code/-/fira-code-5.3.0.tgz#487475cedfa1f7ba7650810ddce00b6c7b1b7a25"
   integrity sha512-EJL968RJRkakubAj/coU8pSUaeTE5UNoRjtzAr6kGiSZ3jWuN8/AKWHwym/PFUaQL1q7IL/H+EXs4358YhrTBQ==
 
-"@fontsource/ibm-plex-mono@^5.2.7":
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/@fontsource/ibm-plex-mono/-/ibm-plex-mono-5.2.7.tgz#ef5b6f052115fdf6666208a5f8a0f13fcd7ba1fd"
-  integrity sha512-MKAb8qV+CaiMQn2B0dIi1OV3565NYzp3WN5b4oT6LTkk+F0jR6j0ZN+5BKJiIhffDC3rtBULsYZE65+0018z9w==
+"@fontsource/ibm-plex-mono@^5.3.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@fontsource/ibm-plex-mono/-/ibm-plex-mono-5.3.0.tgz#1879699d104602d5331e28e103f33c3b1b766b17"
+  integrity sha512-eTgnZjZEGk1QtD3ZstF+Vclo2HLAni8YMy34/DxllwZvyz1lR/1RF/xTiAquOBO7MvqBx8D2Ig2WCPMVfdZu7Q==
 
 "@fontsource/inter@^5.3.0":
   version "5.3.0"

superset-frontend/package-lock.json

@@ -31,7 +31,7 @@
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.1",
         "@fontsource/fira-code": "^5.3.0",
-        "@fontsource/ibm-plex-mono": "^5.2.7",
+        "@fontsource/ibm-plex-mono": "^5.3.0",
         "@fontsource/inter": "^5.3.0",
         "@googleapis/sheets": "^13.0.2",
         "@great-expectations/jsonforms-antd-renderers": "^2.2.10",
@@ -45,9 +45,9 @@
         "@luma.gl/shadertools": "~9.2.5",
         "@luma.gl/webgl": "~9.2.5",
         "@reduxjs/toolkit": "^1.9.3",
-        "@rjsf/core": "^6.6.2",
+        "@rjsf/core": "^6.7.0",
         "@rjsf/utils": "^6.6.2",
-        "@rjsf/validator-ajv8": "^6.6.2",
+        "@rjsf/validator-ajv8": "^6.7.0",
         "@scarf/scarf": "^1.4.0",
         "@superset-ui/chart-controls": "file:./packages/superset-ui-chart-controls",
         "@superset-ui/core": "file:./packages/superset-ui-core",
@@ -4073,9 +4073,9 @@
       }
     },
     "node_modules/@fontsource/ibm-plex-mono": {
-      "version": "5.2.7",
-      "resolved": "https://registry.npmjs.org/@fontsource/ibm-plex-mono/-/ibm-plex-mono-5.2.7.tgz",
-      "integrity": "sha512-MKAb8qV+CaiMQn2B0dIi1OV3565NYzp3WN5b4oT6LTkk+F0jR6j0ZN+5BKJiIhffDC3rtBULsYZE65+0018z9w==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@fontsource/ibm-plex-mono/-/ibm-plex-mono-5.3.0.tgz",
+      "integrity": "sha512-eTgnZjZEGk1QtD3ZstF+Vclo2HLAni8YMy34/DxllwZvyz1lR/1RF/xTiAquOBO7MvqBx8D2Ig2WCPMVfdZu7Q==",
       "license": "OFL-1.1",
       "funding": {
         "url": "https://github.com/sponsors/ayuhito"
@@ -9963,33 +9963,33 @@
       "license": "MIT"
     },
     "node_modules/@rjsf/core": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-6.6.2.tgz",
-      "integrity": "sha512-rmckOHIc0N3Vu0egcjrm4aRnw4ETW1i4fGdm0m63qd/298zHfF7x2md2rDh8F5HLgoxW3X/LdvrCHcsD1lxbGw==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-6.7.0.tgz",
+      "integrity": "sha512-TdiiRf9H6R7mYXyRq1TQHhTSdX9lpvYHsfn1obWksICbZEg4jBFBh7BuyrcHhzGos6976GsLO4TTYw11fQUbpQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "lodash": "^4.18.1",
         "lodash-es": "^4.18.1",
-        "markdown-to-jsx": "^9.8.1",
+        "markdown-to-jsx": "^9.8.2",
         "prop-types": "^15.8.1"
       },
       "engines": {
         "node": ">=20"
       },
       "peerDependencies": {
-        "@rjsf/utils": "^6.6.x",
+        "@rjsf/utils": "^6.7.0",
         "react": ">=18"
       }
     },
     "node_modules/@rjsf/utils": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/@rjsf/utils/-/utils-6.6.2.tgz",
-      "integrity": "sha512-npqdWuuFmCkiXETrDLRx8a4EwDJoUdTTnGhJA/774bwDgT99u4nAEyXbJd75VuobunewcLm2FOS2cErD3e28cg==",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/@rjsf/utils/-/utils-6.7.1.tgz",
+      "integrity": "sha512-6goBapMwyHcXvjLkCnFs4S3P1oKUi1H083BdPk4pDZALFWn5ZdG50ECNfHSddBmL3O0pyx1/WFq1C/MuR7Y54A==",
       "license": "Apache-2.0",
       "dependencies": {
         "@x0k/json-schema-merge": "^1.0.3",
         "fast-equals": "^6.0.0",
-        "fast-uri": "^3.1.2",
+        "fast-uri": "^4.1.1",
         "jsonpointer": "^5.0.1",
         "lodash": "^4.18.1",
         "lodash-es": "^4.18.1",
@@ -10003,9 +10003,9 @@
       }
     },
     "node_modules/@rjsf/validator-ajv8": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/@rjsf/validator-ajv8/-/validator-ajv8-6.6.2.tgz",
-      "integrity": "sha512-pi+CBfkXxyR1JhEveuwi7qA9NcqYvFSvadY8LkQDC6wP89bZS8TYXzolirvXC7okDdI3WCtPjx/FYnxYpXbj7Q==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@rjsf/validator-ajv8/-/validator-ajv8-6.7.0.tgz",
+      "integrity": "sha512-GAo1BknPXVncMwCsnAg/UpLPvdzVuyB73FbdPe5p3VjefrdVFjbbtaYMsFUN5iGMKe5fIQOZD9ke5ajvTZjJPA==",
       "license": "Apache-2.0",
       "dependencies": {
         "ajv": "^8.20.0",
@@ -10017,7 +10017,7 @@
         "node": ">=20"
       },
       "peerDependencies": {
-        "@rjsf/utils": "^6.6.x"
+        "@rjsf/utils": "^6.7.0"
       }
     },
     "node_modules/@rtsao/scc": {

superset-frontend/package.json

@@ -116,7 +116,7 @@
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
     "@fontsource/fira-code": "^5.3.0",
-    "@fontsource/ibm-plex-mono": "^5.2.7",
+    "@fontsource/ibm-plex-mono": "^5.3.0",
     "@fontsource/inter": "^5.3.0",
     "@googleapis/sheets": "^13.0.2",
     "@great-expectations/jsonforms-antd-renderers": "^2.2.10",
@@ -130,9 +130,9 @@
     "@luma.gl/shadertools": "~9.2.5",
     "@luma.gl/webgl": "~9.2.5",
     "@reduxjs/toolkit": "^1.9.3",
-    "@rjsf/core": "^6.6.2",
+    "@rjsf/core": "^6.7.0",
     "@rjsf/utils": "^6.6.2",
-    "@rjsf/validator-ajv8": "^6.6.2",
+    "@rjsf/validator-ajv8": "^6.7.0",
     "@scarf/scarf": "^1.4.0",
     "@superset-ui/chart-controls": "file:./packages/superset-ui-chart-controls",
     "@superset-ui/core": "file:./packages/superset-ui-core",

superset-frontend/src/database/actions.test.ts

@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { executeQuery } from './actions';
+import fetchMock from 'fetch-mock';
+
+fetchMock.post('glob:*/sqllab/execute', { result: [] });
+
+afterAll(() => {
+  fetchMock.clearHistory().removeRoutes();
+});
+
+test('executeQuery', async () => {
+  const mockDispatch = jest.fn();
+  const mockedQueryExecutePayload = {
+    client_id: 'client_id_1',
+    database_id: 1,
+    runAsync: false,
+    catalog: null,
+    schema: 'schema_1',
+    sql: '1',
+    tmp_table_name: 'tmp_table_1',
+    select_as_cta: false,
+    ctas_method: 'SELECT',
+    queryLimit: 10,
+    expand_data: false,
+  };
+
+  const returnedDispatchFunc = executeQuery(mockedQueryExecutePayload);
+  await returnedDispatchFunc(mockDispatch);
+
+  const [
+    [setQueryIsLoadingActionObject],
+    [setQueryResultActionObject],
+    [setQueryIsNotLoadingActionObject],
+  ] = mockDispatch.mock.calls;
+  expect(setQueryIsLoadingActionObject).toStrictEqual({
+    type: 'SET_QUERY_IS_LOADING',
+    payload: true,
+  });
+  expect(setQueryResultActionObject).toStrictEqual({
+    type: 'SET_QUERY_RESULT',
+    payload: {
+      result: [],
+    },
+  });
+  expect(setQueryIsNotLoadingActionObject).toStrictEqual({
+    type: 'SET_QUERY_IS_LOADING',
+    payload: false,
+  });
+});

superset-frontend/src/database/actions.ts

@@ -67,7 +67,7 @@ export function executeQuery(payload: QueryExecutePayload) {
       const result = await executeQueryApi(payload);
       dispatch(setQueryResult(result as QueryExecuteResponse));
     } catch (error) {
-      dispatch(setQueryError(error.message));
+      dispatch(setQueryError((error as Error).message));
     } finally {
       dispatch(setQueryIsLoading(false));
     }

superset-websocket/package-lock.json

@@ -10,7 +10,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "cookie": "^2.0.1",
-        "hot-shots": "^17.0.0",
+        "hot-shots": "^17.0.1",
         "ioredis": "^5.11.1",
         "jsonwebtoken": "^9.0.3",
         "lodash-es": "^4.18.1",
@@ -1737,9 +1737,9 @@
       }
     },
     "node_modules/hot-shots": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-17.0.0.tgz",
-      "integrity": "sha512-d3URpxEO5b0HQfZsrU2qRJ+cUPr9WBrsgHCVnD1bRdFI7KIZokNVI8n1uthsl4WB2l50WWS9vTlwJSOF/6I12w==",
+      "version": "17.0.1",
+      "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-17.0.1.tgz",
+      "integrity": "sha512-szraf3bR/vhzRajfq0SnUf07hpraR5JMuwJ2zOoFdqfYrW8V3qdLTf8qJEgfPpjs19AVIqxJrZXaLgeL3IYlBA==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"

superset-websocket/package.json

@@ -19,7 +19,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "cookie": "^2.0.1",
-    "hot-shots": "^17.0.0",
+    "hot-shots": "^17.0.1",
     "ioredis": "^5.11.1",
     "jsonwebtoken": "^9.0.3",
     "lodash-es": "^4.18.1",