Skip to content

Commit 9fcf6d8

Browse files
sadpandajoesadpandajoe
authored
Merge branch 'master' into fix-echart-save-issue
2 parents 5a194fd + fc705d9 commit 9fcf6d8

File tree

116 files changed

+7639
-3060
lines changed

Some content is hidden

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

116 files changed

+7639
-3060
lines changed

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,27 +51,31 @@ jobs:
5151
- name: supersetbot bump-python -p "${{ github.event.inputs.package }}"
5252
env:
5353
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54+
INPUT_PACKAGE: ${{ github.event.inputs.package }}
55+
INPUT_GROUP: ${{ github.event.inputs.group }}
56+
INPUT_EXTRA_FLAGS: ${{ github.event.inputs.extra-flags }}
57+
INPUT_LIMIT: ${{ github.event.inputs.limit }}
5458
run: |
5559
git config --global user.email "action@github.com"
5660
git config --global user.name "GitHub Action"
5761
5862
PACKAGE_OPT=""
59-
if [ -n "${{ github.event.inputs.package }}" ]; then
60-
PACKAGE_OPT="-p ${{ github.event.inputs.package }}"
63+
if [ -n "${INPUT_PACKAGE}" ]; then
64+
PACKAGE_OPT="-p ${INPUT_PACKAGE}"
6165
fi
6266
6367
GROUP_OPT=""
64-
if [ -n "${{ github.event.inputs.group }}" ]; then
65-
GROUP_OPT="-g ${{ github.event.inputs.group }}"
68+
if [ -n "${INPUT_GROUP}" ]; then
69+
GROUP_OPT="-g ${INPUT_GROUP}"
6670
fi
6771
68-
EXTRA_FLAGS="${{ github.event.inputs.extra-flags }}"
72+
EXTRA_FLAGS="${INPUT_EXTRA_FLAGS}"
6973
7074
supersetbot bump-python \
7175
--verbose \
7276
--use-current-repo \
7377
--include-subpackages \
74-
--limit ${{ github.event.inputs.limit }} \
78+
--limit ${INPUT_LIMIT} \
7579
$PACKAGE_OPT \
7680
$GROUP_OPT \
7781
$EXTRA_FLAGS

‎.github/workflows/claude.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
fetch-depth: 1
7777

7878
- name: Run Claude PR Action
79-
uses: anthropics/claude-code-action@6062f3709600659be5e47fcddf2cf76993c235c2 # beta
79+
uses: anthropics/claude-code-action@094bd24d575e7b30ac1576024817bf1a97c81262 # beta
8080
with:
8181
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
8282
timeout_minutes: "60"

‎.github/workflows/embedded-sdk-release.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ jobs:
1616
id: check
1717
shell: bash
1818
run: |
19-
if [ -n "${{ (secrets.NPM_TOKEN != '') || '' }}" ]; then
19+
if [ -n "${NPM_TOKEN}" ]; then
2020
echo "has-secrets=1" >> "$GITHUB_OUTPUT"
2121
fi
2222
23+
env:
24+
NPM_TOKEN: ${{ (secrets.NPM_TOKEN != '') || '' }}
2325
build:
2426
needs: config
2527
if: needs.config.outputs.has-secrets

‎.github/workflows/ephemeral-env-pr-close.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ jobs:
2020
id: check
2121
shell: bash
2222
run: |
23-
if [ -n "${{ (secrets.AWS_ACCESS_KEY_ID != '' && secrets.AWS_SECRET_ACCESS_KEY != '') || '' }}" ]; then
23+
if [ -n "${AWS_ACCESS_KEY_ID}" ]; then
2424
echo "has-secrets=1" >> "$GITHUB_OUTPUT"
2525
fi
2626
27+
env:
28+
AWS_ACCESS_KEY_ID: ${{ (secrets.AWS_ACCESS_KEY_ID != '' && secrets.AWS_SECRET_ACCESS_KEY != '') || '' }}
2729
ephemeral-env-cleanup:
2830
needs: config
2931
if: needs.config.outputs.has-secrets
@@ -33,7 +35,7 @@ jobs:
3335
pull-requests: write
3436
steps:
3537
- name: Configure AWS credentials
36-
uses: aws-actions/configure-aws-credentials@v6
38+
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6
3739
with:
3840
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
3941
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -56,7 +58,7 @@ jobs:
5658
- name: Login to Amazon ECR
5759
if: steps.describe-services.outputs.active == 'true'
5860
id: login-ecr
59-
uses: aws-actions/amazon-ecr-login@v2
61+
uses: aws-actions/amazon-ecr-login@183a1442edf41672e66566b7fc560e297a290896 # v2
6062

6163
- name: Delete ECR image tag
6264
if: steps.describe-services.outputs.active == 'true'

‎.github/workflows/ephemeral-env.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
id: eval-label
4848
run: |
4949
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
50-
LABEL_NAME="${{ github.event.inputs.label_name }}"
50+
LABEL_NAME="${INPUT_LABEL_NAME}"
5151
else
5252
LABEL_NAME="${{ github.event.label.name }}"
5353
fi
@@ -60,6 +60,8 @@ jobs:
6060
echo "result=noop" >> $GITHUB_OUTPUT
6161
fi
6262
63+
env:
64+
INPUT_LABEL_NAME: ${{ github.event.inputs.label_name }}
6365
- name: Get event SHA
6466
id: get-sha
6567
if: steps.eval-label.outputs.result == 'up'
@@ -276,7 +278,9 @@ jobs:
276278
- name: Describe ECS service
277279
id: describe-services
278280
run: |
279-
echo "active=$(aws ecs describe-services --cluster superset-ci --services pr-${{ github.event.inputs.issue_number || github.event.pull_request.number }}-service | jq '.services[] | select(.status == "ACTIVE") | any')" >> $GITHUB_OUTPUT
281+
echo "active=$(aws ecs describe-services --cluster superset-ci --services pr-${INPUT_ISSUE_NUMBER}-service | jq '.services[] | select(.status == "ACTIVE") | any')" >> $GITHUB_OUTPUT
282+
env:
283+
INPUT_ISSUE_NUMBER: ${{ github.event.inputs.issue_number || github.event.pull_request.number }}
280284
- name: Create ECS service
281285
id: create-service
282286
if: steps.describe-services.outputs.active != 'true'
@@ -296,7 +300,7 @@ jobs:
296300
--tags key=pr,value=$PR_NUMBER key=github_user,value=${{ github.actor }}
297301
- name: Deploy Amazon ECS task definition
298302
id: deploy-task
299-
uses: aws-actions/amazon-ecs-deploy-task-definition@cbf54ec46642b86ff78c2f5793da6746954cf8ff # v2
303+
uses: aws-actions/amazon-ecs-deploy-task-definition@fc8fc60f3a60ffd500fcb13b209c59d221ac8c8c # v2
300304
with:
301305
task-definition: ${{ steps.task-def.outputs.task-definition }}
302306
service: pr-${{ github.event.inputs.issue_number || github.event.pull_request.number }}-service
@@ -307,7 +311,9 @@ jobs:
307311
- name: List tasks
308312
id: list-tasks
309313
run: |
310-
echo "task=$(aws ecs list-tasks --cluster superset-ci --service-name pr-${{ github.event.inputs.issue_number || github.event.pull_request.number }}-service | jq '.taskArns | first')" >> $GITHUB_OUTPUT
314+
echo "task=$(aws ecs list-tasks --cluster superset-ci --service-name pr-${INPUT_ISSUE_NUMBER}-service | jq '.taskArns | first')" >> $GITHUB_OUTPUT
315+
env:
316+
INPUT_ISSUE_NUMBER: ${{ github.event.inputs.issue_number || github.event.pull_request.number }}
311317
- name: Get network interface
312318
id: get-eni
313319
run: |

‎.github/workflows/generate-FOSSA-report.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ jobs:
1616
id: check
1717
shell: bash
1818
run: |
19-
if [ -n "${{ (secrets.FOSSA_API_KEY != '' ) || '' }}" ]; then
19+
if [ -n "${FOSSA_API_KEY}" ]; then
2020
echo "has-secrets=1" >> "$GITHUB_OUTPUT"
2121
fi
2222
23+
env:
24+
FOSSA_API_KEY: ${{ (secrets.FOSSA_API_KEY != '' ) || '' }}
2325
license_check:
2426
needs: config
2527
if: needs.config.outputs.has-secrets

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ jobs:
1616
id: check
1717
shell: bash
1818
run: |
19-
if [ -n "${{ (secrets.NPM_TOKEN != '' && secrets.GH_PERSONAL_ACCESS_TOKEN != '') || '' }}" ]; then
19+
if [ -n "${NPM_TOKEN}" ]; then
2020
echo "has-secrets=1" >> "$GITHUB_OUTPUT"
2121
fi
2222
23+
env:
24+
NPM_TOKEN: ${{ (secrets.NPM_TOKEN != '' && secrets.GH_PERSONAL_ACCESS_TOKEN != '') || '' }}
2325
build:
2426
needs: config
2527
if: needs.config.outputs.has-secrets

‎.github/workflows/showtime-trigger.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,23 +102,27 @@ jobs:
102102
- name: Install Superset Showtime
103103
if: steps.auth.outputs.authorized == 'true'
104104
run: |
105-
echo "::notice::Maintainer ${{ github.actor }} triggered deploy for PR ${{ github.event.pull_request.number || github.event.inputs.pr_number }}"
105+
echo "::notice::Maintainer ${{ github.actor }} triggered deploy for PR ${PULL_REQUEST_NUMBER}"
106106
pip install --upgrade superset-showtime
107107
showtime version
108108
109+
env:
110+
PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number || github.event.inputs.pr_number }}
109111
- name: Check what actions are needed
110112
if: steps.auth.outputs.authorized == 'true'
111113
id: check
112114
env:
113115
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
114116
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
115117
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
118+
INPUT_PR_NUMBER: ${{ github.event.inputs.pr_number }}
119+
INPUT_SHA: ${{ github.event.inputs.sha }}
116120
run: |
117121
# Bulletproof PR number extraction
118122
if [[ -n "${{ github.event.pull_request.number }}" ]]; then
119123
PR_NUM="${{ github.event.pull_request.number }}"
120-
elif [[ -n "${{ github.event.inputs.pr_number }}" ]]; then
121-
PR_NUM="${{ github.event.inputs.pr_number }}"
124+
elif [[ -n "${INPUT_PR_NUMBER}" ]]; then
125+
PR_NUM="${INPUT_PR_NUMBER}"
122126
else
123127
echo "❌ No PR number found in event or inputs"
124128
exit 1
@@ -127,8 +131,8 @@ jobs:
127131
echo "Using PR number: $PR_NUM"
128132
129133
# Run sync check-only with optional SHA override
130-
if [[ -n "${{ github.event.inputs.sha }}" ]]; then
131-
OUTPUT=$(python -m showtime sync $PR_NUM --check-only --sha "${{ github.event.inputs.sha }}")
134+
if [[ -n "${INPUT_SHA}" ]]; then
135+
OUTPUT=$(python -m showtime sync $PR_NUM --check-only --sha "${INPUT_SHA}")
132136
else
133137
OUTPUT=$(python -m showtime sync $PR_NUM --check-only)
134138
fi

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ jobs:
2727
id: check
2828
shell: bash
2929
run: |
30-
if [ -n "${{ (secrets.SUPERSET_SITE_BUILD != '' && secrets.SUPERSET_SITE_BUILD != '') || '' }}" ]; then
30+
if [ -n "${SUPERSET_SITE_BUILD}" ]; then
3131
echo "has-secrets=1" >> "$GITHUB_OUTPUT"
3232
fi
3333
34+
env:
35+
SUPERSET_SITE_BUILD: ${{ (secrets.SUPERSET_SITE_BUILD != '' && secrets.SUPERSET_SITE_BUILD != '') || '' }}
3436
build-deploy:
3537
needs: config
3638
if: needs.config.outputs.has-secrets

‎.github/workflows/superset-extensions-cli.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
5050
- name: Upload coverage reports to Codecov
5151
if: steps.check.outputs.superset-extensions-cli
52-
uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5
52+
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
5353
with:
5454
file: ./coverage.xml
5555
flags: superset-extensions-cli

0 commit comments

Comments
 (0)