Skip to content

Commit 1c35e51

Browse files
ilia-dbkartikgupta-dbgithub-actions[bot]web-floweng-dev-ecosystem-bot
authored
Merge bundle-integ into main (#1414)
## Changes Decided to avoid bypassing branch protections by force pushing `bundle-integ` into `main`. Instead: - checkout a new branch from `main` - `git revert` everything until a common ancestor with the `bundle-integ` (based on `git merge-base`), [here's the commit](2b7e826) - `git merge bundle-integ` - add [one additional commit to update GH workflows](b802322). ## Tests Built and checked the extension manually. Unit tests pass, will check integ tests in this PR --------- Co-authored-by: kartikgupta-db <kartik.gupta@databricks.com> Co-authored-by: Kartik Gupta <88345179+kartikgupta-db@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: releasebot <noreply@github.com> Co-authored-by: eng-dev-ecosystem-bot <eng-dev-ecosystem-bot@users.noreply.github.com> Co-authored-by: eng-dev-ecosystem-bot <110475461+eng-dev-ecosystem-bot@users.noreply.github.com> Co-authored-by: Serge Smertin <259697+nfx@users.noreply.github.com> Co-authored-by: Fabian Jakobs <fabian.jakobs@databricks.com> Co-authored-by: Julia Crawford (Databricks) <julia.crawford@databricks.com> Co-authored-by: hectorcast-db <hector.castejon@databricks.com>
1 parent 4de94c7 commit 1c35e51

File tree

218 files changed

+33947
-8259
lines changed

Some content is hidden

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

218 files changed

+33947
-8259
lines changed

‎.eslintrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"overrides": [
2828
{
29-
"files": "**/*.test.ts",
29+
"files": ["**/*.test.ts", "**/test/**"],
3030
"rules": {
3131
"no-console": "off"
3232
}

‎.github/workflows/create-build-artifacts.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
working-directory: packages/databricks-vscode
2626
env:
2727
GH_TOKEN: ${{ github.token }}
28+
BUILD_PLATFORM_ARCH: linux_amd64
2829

2930
- uses: actions/upload-artifact@v3
3031
with:

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

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: integration
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize]
6+
7+
merge_group:
8+
9+
jobs:
10+
trigger-tests:
11+
if: github.event_name == 'pull_request'
12+
name: Trigger Tests
13+
runs-on: ubuntu-latest
14+
environment: "test-trigger-is"
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
19+
- name: Generate GitHub App Token
20+
id: generate-token
21+
uses: actions/create-github-app-token@v1
22+
with:
23+
app-id: ${{ secrets.DECO_WORKFLOW_TRIGGER_APP_ID }}
24+
private-key: ${{ secrets.DECO_WORKFLOW_TRIGGER_PRIVATE_KEY }}
25+
owner: ${{ secrets.ORG_NAME }}
26+
repositories: ${{secrets.REPO_NAME}}
27+
28+
- name: Trigger Workflow in Another Repo
29+
env:
30+
GH_TOKEN: ${{ steps.generate-token.outputs.token }}
31+
run: |
32+
gh workflow run vscode-isolated-pr.yml -R ${{ secrets.ORG_NAME }}/${{secrets.REPO_NAME}} \
33+
--ref main \
34+
-f pull_request_number=${{ github.event.pull_request.number }} \
35+
-f commit_sha=${{ github.event.pull_request.head.sha }}
36+
37+
# Statuses and checks apply to specific commits (by hash).
38+
# Enforcement of required checks is done both at the PR level and the merge queue level.
39+
# In case of multiple commits in a single PR, the hash of the squashed commit
40+
# will not match the one for the latest (approved) commit in the PR.
41+
# We auto approve the check for the merge queue for two reasons:
42+
# * Queue times out due to duration of tests.
43+
# * Avoid running integration tests twice, since it was already run at the tip of the branch before squashing.
44+
auto-approve:
45+
if: github.event_name == 'merge_group'
46+
runs-on: ubuntu-latest
47+
steps:
48+
- name: Mark Check
49+
env:
50+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51+
shell: bash
52+
run: |
53+
gh api -X POST -H "Accept: application/vnd.github+json" \
54+
-H "X-GitHub-Api-Version: 2022-11-28" \
55+
/repos/${{ github.repository }}/statuses/${{ github.sha }} \
56+
-f 'state=success' \
57+
-f 'context=Integration Tests Check'

‎.github/workflows/nightly-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
- name: Update nightly release
2525
uses: softprops/action-gh-release@v1
2626
with:
27-
name: Nightly
27+
name: Nightly - ${{ github.ref_name }}
2828
prerelease: true
29-
tag_name: nightly
29+
tag_name: nightly-${{ github.ref_name }}
3030
token: ${{ secrets.GITHUB_TOKEN }}
3131
files: "packages/databricks-vscode/databricks*/*.vsix"

‎.github/workflows/publish-to-vscode.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313

1414
jobs:
1515
publish-to-vscode:
16-
if: ${{ ! endsWith(github.event.inputs.version, 'preview') || github.event_name == 'workflow_dispatch' }}
1716
runs-on: ubuntu-latest
1817
environment: Production
1918

@@ -54,13 +53,13 @@ jobs:
5453
env:
5554
VSCE_TOKEN: ${{ secrets.VSCE_TOKEN }}
5655

57-
- name: Install ovsx
58-
run: npm install -g ovsx
56+
# - name: Install ovsx
57+
# run: npm install -g ovsx
5958

60-
- name: Publish to Open VSIX
61-
run: |
62-
ovsx verify-pat databricks
63-
ovsx publish --packagePath databricks-*.vsix
59+
# - name: Publish to Open VSIX
60+
# run: |
61+
# ovsx verify-pat databricks
62+
# ovsx publish --packagePath databricks-*.vsix
6463

65-
env:
66-
OVSX_PAT: ${{ secrets.OVSX_PAT }}
64+
# env:
65+
# OVSX_PAT: ${{ secrets.OVSX_PAT }}

‎.github/workflows/push.yml‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,8 @@ on:
77
branches: [main]
88

99
jobs:
10-
run-tests:
11-
strategy:
12-
fail-fast: false
13-
matrix:
14-
arch:
15-
[
16-
{ cli_arch: darwin_amd64, os: macos-latest },
17-
{ cli_arch: windows_amd64, os: windows-latest },
18-
]
19-
node-version: [18.x]
20-
vscode-version: [stable]
21-
uses: ./.github/workflows/tests.yml
22-
with:
23-
os: ${{ matrix.arch.os }}
24-
node-version: ${{ matrix.node-version }}
25-
vscode-version: ${{ matrix.vscode-version }}
26-
cli_arch: ${{ matrix.arch.cli_arch }}
27-
secrets: inherit
28-
2910
package:
30-
name: Package VSIX
31-
needs: "run-tests"
11+
name: Package Arm64 VSIX
3212
runs-on: "macos-latest"
3313
steps:
3414
- uses: actions/checkout@v3
@@ -53,7 +33,7 @@ jobs:
5333
- run: mkdir -p packages/databricks-vscode/artifacts
5434

5535
- name: Build VSIX
56-
run: yarn package -o artifacts -t darwin-x64
36+
run: yarn package -o artifacts -t darwin-arm64
5737
working-directory: packages/databricks-vscode
5838

5939
- name: Upload artifacts

‎.github/workflows/tests.yml‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
| System | Status |
44
| ---------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
5-
| Build ([main branch](https://github.com/databricks/databricks-vscode/commits/main)) | [![GitHub CI Status](https://github.com/databricks/databricks-vscode/actions/workflows/push.yml/badge.svg?branch=main)](https://github.com/databricks/databricks-vscode/actions/workflows/push.yml) [![codecov](https://codecov.io/gh/databricks/databricks-vscode/branch/main/graph/badge.svg?token=PUN77X0W3Z)](https://codecov.io/gh/databricks/databricks-vscode) [![lines of code](https://tokei.rs/b1/github/databricks/databricks-vscode)]([https://codecov.io/github/databricks/databricks-vscode](https://github.com/databricks/databricks-vscode)) |
5+
| Build ([main branch](https://github.com/databricks/databricks-vscode/commits/main)) | [![GitHub CI Status](https://github.com/databricks/databricks-vscode/actions/workflows/push.yml/badge.svg?branch=main)](https://github.com/databricks/databricks-vscode/actions/workflows/push.yml) [![codecov](https://codecov.io/gh/databricks/databricks-vscode/branch/main/graph/badge.svg?token=PUN77X0W3Z)](https://codecov.io/gh/databricks/databricks-vscode) |
66
| [Marketplace](https://marketplace.visualstudio.com/items?itemName=databricks.databricks) | [![Marketplace Version](https://img.shields.io/vscode-marketplace/v/databricks.databricks.svg) ![Marketplace Downloads](https://img.shields.io/vscode-marketplace/d/databricks.databricks.svg)](https://marketplace.visualstudio.com/items?itemName=databricks.databricks) |
77

88
## Introduction

‎databricks-vscode.code-workspace‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
},
2323
"[typescript]": {
2424
"editor.defaultFormatter": "esbenp.prettier-vscode"
25-
}
25+
},
26+
"jupyter.interactiveWindow.cellMarker.codeRegex": "^# COMMAND ----------|^# Databricks notebook source|^(#\\s*%%|#\\s*\\<codecell\\>|#\\s*In\\[\\d*?\\]|#\\s*In\\[ \\])",
27+
"jupyter.interactiveWindow.cellMarker.default": "# COMMAND ----------"
2628
}
2729
}

‎package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@databricks/databricks-vscode",
3-
"version": "1.4.0",
3+
"version": "2.4.7",
44
"private": true,
55
"workspaces": [
66
"packages/*"
@@ -34,15 +34,15 @@
3434
"homepage": "https://github.com/databricks/databricks-vscode#readme",
3535
"packageManager": "yarn@3.2.1",
3636
"devDependencies": {
37-
"@types/node": "^20.5.0",
38-
"@typescript-eslint/eslint-plugin": "^6.0.0",
39-
"@typescript-eslint/parser": "^6.0.0",
40-
"conventional-changelog-cli": "^3.0.0",
41-
"eslint": "^8.51.0",
42-
"eslint-config-prettier": "^8.8.0",
37+
"@types/node": "^20.10.4",
38+
"@typescript-eslint/eslint-plugin": "^6.14.0",
39+
"@typescript-eslint/parser": "^6.14.0",
40+
"conventional-changelog-cli": "^4.1.0",
41+
"eslint": "^8.55.0",
42+
"eslint-config-prettier": "^9.1.0",
4343
"eslint-plugin-no-only-tests": "^3.1.0",
4444
"ts-mockito": "^2.6.1",
45-
"typescript": "5.1.6"
45+
"typescript": "^5.3.3"
4646
},
4747
"resolutions": {
4848
"json5": "2.2.2"

0 commit comments

Comments
 (0)