Skip to content

Commit a725914

Browse files
authored
Merge branch 'main' into simonfaltum/list-tui-overrides-2
2 parents 5158ea6 + eb9b9a8 commit a725914

File tree

51 files changed

+508
-78
lines changed

Some content is hidden

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

51 files changed

+508
-78
lines changed

.github/actions/setup-build-environment/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ runs:
2525
cache.txt
2626
2727
- name: Setup Python
28-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
28+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
2929
with:
3030
python-version: '3.13'
3131

3232
- name: Install uv
33-
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
33+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
3434
with:
3535
version: "0.8.9"
3636

.github/workflows/push.yml

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ jobs:
346346
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
347347

348348
- name: Install uv
349-
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
349+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
350350
with:
351351
version: "0.6.5"
352352

@@ -362,14 +362,14 @@ jobs:
362362
fi
363363
364364
# Trigger integration tests in a separate repository.
365-
# Requires secrets from "test-trigger-is" environment (not available for fork PRs).
365+
# Requires secrets from "test-trigger-is" environment (not available for fork PRs or dependabot).
366366
# Auto-approves for merge groups to avoid running twice and queue timeouts.
367367
integration-trigger:
368368
needs:
369369
- testmask
370370

371371
if: >-
372-
(github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork) ||
372+
(github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]') ||
373373
(github.event_name == 'merge_group') ||
374374
(github.event_name == 'push')
375375
@@ -387,7 +387,7 @@ jobs:
387387
- name: Generate GitHub App Token
388388
if: ${{ github.event_name == 'pull_request' || github.event_name == 'push' }}
389389
id: generate-token
390-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
390+
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
391391
with:
392392
app-id: ${{ secrets.DECO_WORKFLOW_TRIGGER_APP_ID }}
393393
private-key: ${{ secrets.DECO_WORKFLOW_TRIGGER_PRIVATE_KEY }}
@@ -399,7 +399,7 @@ jobs:
399399
(github.event_name == 'merge_group') ||
400400
(github.event_name == 'pull_request' && !contains(fromJSON(needs.testmask.outputs.targets), 'test'))
401401
id: generate-check-token
402-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
402+
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
403403
with:
404404
app-id: ${{ secrets.DECO_TEST_APPROVAL_APP_ID }}
405405
private-key: ${{ secrets.DECO_TEST_APPROVAL_PRIVATE_KEY }}
@@ -468,3 +468,37 @@ jobs:
468468
gh workflow run cli-isolated-nightly.yml -R ${{ secrets.ORG_NAME }}/${{ secrets.REPO_NAME }} \
469469
--ref main \
470470
-f commit_sha=${{ github.event.after }}
471+
472+
# Skip integration tests for dependabot PRs.
473+
# Dependabot has no access to the "test-trigger-is" environment secrets,
474+
# so we use the built-in GITHUB_TOKEN to mark the required "Integration
475+
# Tests" check as passed.
476+
integration-trigger-dependabot:
477+
if: >-
478+
github.event_name == 'pull_request' &&
479+
github.actor == 'dependabot[bot]'
480+
481+
runs-on:
482+
group: databricks-deco-testing-runner-group
483+
labels: ubuntu-latest-deco
484+
485+
permissions:
486+
checks: write
487+
488+
steps:
489+
- name: Skip integration tests
490+
uses: actions/github-script@v8
491+
with:
492+
script: |-
493+
await github.rest.checks.create({
494+
owner: context.repo.owner,
495+
repo: context.repo.repo,
496+
name: 'Integration Tests',
497+
head_sha: '${{ github.event.pull_request.head.sha }}',
498+
status: 'completed',
499+
conclusion: 'success',
500+
output: {
501+
title: 'Integration Tests',
502+
summary: '⏭️ Skipped (dependabot PR)'
503+
}
504+
});

.github/workflows/python_push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3434

3535
- name: Install uv
36-
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
36+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
3737
with:
3838
python-version: ${{ matrix.pyVersion }}
3939
version: "0.6.5"
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5252

5353
- name: Install uv
54-
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
54+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
5555
with:
5656
version: "0.6.5"
5757

@@ -68,7 +68,7 @@ jobs:
6868
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6969

7070
- name: Install uv
71-
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
71+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
7272
with:
7373
version: "0.6.5"
7474

.github/workflows/release-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
- name: Run GoReleaser
5050
id: releaser
51-
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
51+
uses: goreleaser/goreleaser-action@ec59f474b9834571250b370d4735c50f8e2d1e29 # v7.0.0
5252
with:
5353
version: ~> v2
5454
args: release --snapshot --skip docker

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
- name: Run GoReleaser for Unix
5858
id: releaser
59-
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
59+
uses: goreleaser/goreleaser-action@ec59f474b9834571250b370d4735c50f8e2d1e29 # v7.0.0
6060
with:
6161
version: ~> v2
6262
args: release -f .goreleaser-unix.yaml
@@ -104,7 +104,7 @@ jobs:
104104
dotnet tool install --global AzureSignTool
105105
106106
- name: Run GoReleaser for Windows
107-
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
107+
uses: goreleaser/goreleaser-action@ec59f474b9834571250b370d4735c50f8e2d1e29 # v7.0.0
108108
with:
109109
version: ~> v2
110110
args: release -f .goreleaser-windows.yaml --skip=publish
@@ -306,7 +306,7 @@ jobs:
306306
fetch-tags: true
307307

308308
- name: Install uv
309-
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
309+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
310310
with:
311311
version: "0.6.5"
312312

.github/workflows/renovate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
renovate:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: renovatebot/github-action@0b17c4eb901eca44d018fb25744a50a74b2042df # v46.1.4
12+
- uses: renovatebot/github-action@abd08c7549b2a864af5df4a2e369c43f035a6a9d # v46.1.5
1313
with:
1414
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/start-integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- name: Generate GitHub App Token for Workflow Trigger
2020
id: generate-token
21-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
21+
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
2222
with:
2323
app-id: ${{ secrets.DECO_WORKFLOW_TRIGGER_APP_ID }}
2424
private-key: ${{ secrets.DECO_WORKFLOW_TRIGGER_PRIVATE_KEY }}
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Generate GitHub App Token for Check Updates
2929
id: generate-check-token
30-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
30+
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
3131
with:
3232
app-id: ${{ secrets.DECO_TEST_APPROVAL_APP_ID }}
3333
private-key: ${{ secrets.DECO_TEST_APPROVAL_PRIVATE_KEY }}

.github/workflows/suggest-reviewers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: suggest-reviewers
22

33
on:
44
pull_request:
5-
types: [opened, synchronize, ready_for_review]
5+
types: [opened, ready_for_review]
66

77
permissions:
88
contents: read
@@ -22,7 +22,7 @@ jobs:
2222
fetch-depth: 0
2323

2424
- name: Install uv
25-
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b # v7.3.0
25+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
2626
with:
2727
version: "0.6.5"
2828

.github/workflows/tagging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
- name: Generate GitHub App Token
3636
id: generate-token
37-
uses: actions/create-github-app-token@v2
37+
uses: actions/create-github-app-token@v3
3838
with:
3939
app-id: ${{ secrets.DECO_SDK_TAGGING_APP_ID }}
4040
private-key: ${{ secrets.DECO_SDK_TAGGING_PRIVATE_KEY }}

NEXT_CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
### CLI
88

99
### Bundles
10+
* engine/direct: Fix drift in grants resource due to privilege reordering ([#4794](https://github.com/databricks/cli/pull/4794))
1011

1112
### Dependency updates
1213

0 commit comments

Comments
 (0)