Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/create-build-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ jobs:
working-directory: packages/databricks-vscode
env:
GH_TOKEN: ${{ github.token }}
BUILD_PLATFORM_ARCH: linux_amd64

- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
Expand Down
3 changes: 1 addition & 2 deletions packages/databricks-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1947,7 +1947,7 @@
"useYarn": false
},
"cli": {
"version": "1.19.0"
"version": "1.20.0"
},
"scripts": {
"vscode:prepublish": "rm -rf out && yarn run package:compile && yarn run package:wrappers:write && yarn run package:jupyter-init-script:write && yarn run package:copy-webview-toolkit && yarn run package:copy-markdown-it && yarn run package:copy-highlight && yarn run generate-telemetry",
Expand Down Expand Up @@ -2037,7 +2037,6 @@
"esbuild": "^0.28.1",
"eslint": "^10.6.0",
"eslint-plugin-local-rules": "^3.0.2",
"extract-zip": "^2.0.1",
"fs-extra": "^11.2.0",
"glob": "^13.0.6",
"mocha": "^12.0.2",
Expand Down
15 changes: 7 additions & 8 deletions packages/databricks-vscode/scripts/package-vsix-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,27 @@ set -ex

# Wrapper around package-vsix.sh that builds a VSIX for the host platform/arch
# and records its filename for the e2e test runner (wdio.conf.ts) to pick up.
# This ensures e2e tests run against a VSIX with terraform + databricks
# provider bundled, matching what is shipped to users.
# This ensures e2e tests run against the same VSIX layout that is shipped
# to users.

cd $(dirname $(realpath $0))/..

OS_RAW=$(uname -s | tr '[:upper:]' '[:lower:]')
case "$OS_RAW" in
linux) PLATFORM=linux; BUILD_OS=linux ;;
darwin) PLATFORM=darwin; BUILD_OS=darwin ;;
mingw*|msys*|cygwin*) PLATFORM=win32; BUILD_OS=windows ;;
linux) PLATFORM=linux ;;
darwin) PLATFORM=darwin ;;
mingw*|msys*|cygwin*) PLATFORM=win32 ;;
*) echo "Unsupported OS: $OS_RAW" >&2; exit 1 ;;
esac

ARCH_RAW=$(uname -m)
case "$ARCH_RAW" in
x86_64|amd64) ARCH=x64; BUILD_ARCH=amd64 ;;
arm64|aarch64) ARCH=arm64; BUILD_ARCH=arm64 ;;
x86_64|amd64) ARCH=x64 ;;
arm64|aarch64) ARCH=arm64 ;;
*) echo "Unsupported arch: $ARCH_RAW" >&2; exit 1 ;;
esac

VSIX_ARCH="${PLATFORM}-${ARCH}"
export BUILD_PLATFORM_ARCH="${BUILD_OS}_${BUILD_ARCH}"

./scripts/package-vsix.sh "$VSIX_ARCH"

Expand Down
15 changes: 0 additions & 15 deletions packages/databricks-vscode/scripts/package-vsix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,10 @@ case $ARCH in
;;
esac

# Download databricks cli to the .build directory with the correct arch for the environment that runs this script (not the target arch of the vsix)
# This CLI is used to request metadata about CLIs terraform dependencies.
if [ ! -d ./.build ]; then
mkdir ./.build
if [ -z "$BUILD_PLATFORM_ARCH" ]; then
BUILD_PLATFORM_ARCH="$(uname -s | awk '{print tolower($0)}')_$(uname -m)"
fi
./scripts/fetch-databricks-cli.sh $BUILD_PLATFORM_ARCH ./.build
fi

rm -rf bin
./scripts/fetch-databricks-cli.sh $CLI_ARCH
yarn ts-node ./scripts/setArchInPackage.ts $VSXI_ARCH -f package.json --cliArch $CLI_ARCH -V $VSXI_ARCH -c $(git rev-parse --short HEAD)

# Don't bundle terraform for win32-arm64 as they don't support it yet: https://github.com/hashicorp/terraform/issues/32719
if [ $ARCH != "win32-arm64" ]; then
yarn ts-node ./scripts/setupCLIDependencies.ts --cli ./.build/databricks --binDir ./bin --package ./package.json --arch $CLI_ARCH
fi

yarn run prettier package.json --write

TAG="release-v$(cat package.json | jq -r .version)" yarn run package -t $VSXI_ARCH
162 changes: 0 additions & 162 deletions packages/databricks-vscode/scripts/setupCLIDependencies.ts

This file was deleted.

Loading
Loading