VSCode: Package bricks from GH actions (#83)

fjakobs · web-flow · commit 6a3137b02e4c · 2022-09-12T10:28:06.000+02:00
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
@@ -3,28 +3,107 @@ name: Publish nightly release
 on:
     push:
         branches: [main]
+        tags:
+            - "v*.*.*"
+    workflow_dispatch:
 
 jobs:
-    archive-build-artifacts:
-        runs-on: ubuntu-latest
+    create-build-artifacts:
+        strategy:
+            matrix:
+                # VSIX architextures: https://github.com/microsoft/vscode-vsce/blob/main/src/package.ts
+                arch:
+                    [
+                        {
+                            bricks_arch: darwin_arm64,
+                            vsix_arch: darwin-arm64,
+                            os: macos-latest,
+                        },
+                        {
+                            bricks_arch: darwin_amd64,
+                            vsix_arch: darwin-x64,
+                            os: macos-latest,
+                        },
+                        {
+                            bricks_arch: linux_arm64,
+                            vsix_arch: linux-arm64,
+                            os: ubuntu-latest,
+                        },
+                        {
+                            bricks_arch: linux_amd64,
+                            vsix_arch: linux-x64,
+                            os: ubuntu-latest,
+                        },
+                        {
+                            bricks_arch: windows_arm64,
+                            vsix_arch: win32-arm64,
+                            os: windows-latest,
+                        },
+                        {
+                            bricks_arch: windows_amd64,
+                            vsix_arch: win32-x64,
+                            os: windows-latest,
+                        },
+                        {
+                            bricks_arch: windows_386,
+                            vsix_arch: win32-ia32,
+                            os: windows-latest,
+                        },
+                    ]
+                node-version: [16.x]
+
+        runs-on: ${{ matrix.arch.os }}
+
+        env:
+            BRICKS_ARCH: ${{ matrix.arch.bricks_arch }}
+
         steps:
             - uses: actions/checkout@v3
 
-            - name: Use Node.js 18.x
+            - name: Use Node.js ${{ matrix.node-version }}
               uses: actions/setup-node@v3
               with:
-                  node-version: 18.x
+                  node-version: ${{ matrix.node-version }}
 
             - run: yarn install
             - run: yarn run build
 
-            - run: yarn run package
+            - run: yarn run package:cli:fetch
               working-directory: packages/databricks-vscode
+              env:
+                  # TODO: Remove this once the bricks repo is public
+                  GH_TOKEN: ${{ secrets.DECO_GITHUB_TOKEN }}
+
+            - run: yarn run package -t ${{ matrix.arch.vsix_arch }}
+              working-directory: packages/databricks-vscode
+
+            - uses: actions/upload-artifact@v2
+              with:
+                  name: databricks-${{ matrix.arch.vsix_arch }}
+                  path: "packages/databricks-vscode/*.vsix"
+
+    create-release:
+        needs: "create-build-artifacts"
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/download-artifact@v3
+              with:
+                  path: packages/databricks-vscode
+
+            - run: ls -lR packages/databricks-vscode
 
             - name: Update nightly release
-              uses: eine/tip@master
+              uses: pyTooling/Actions/releaser@r0
+              if: startsWith(github.ref, 'refs/heads/')
               with:
                   tag: nightly
                   rm: true
                   token: ${{ secrets.GITHUB_TOKEN }}
-                  files: "packages/databricks-vscode/*.vsix"
+                  files: "packages/databricks-vscode/databricks*/*.vsix"
+
+            - name: Release
+              uses: softprops/action-gh-release@v1
+              if: startsWith(github.ref, 'refs/tags/')
+              with:
+                  files: "packages/databricks-vscode/databricks*/*.vsix"
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -11,15 +11,20 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: [macos-latest, windows-latest]
+                arch:
+                    [
+                        {bricks_arch: darwin_amd64, os: macos-latest},
+                        {bricks_arch: windows_amd64, os: windows-latest},
+                    ]
                 node-version: [16.x]
                 vscode-version: [stable, insiders]
 
         uses: ./.github/workflows/tests.yml
         with:
-            os: ${{ matrix.os }}
+            os: ${{ matrix.arch.os }}
             node-version: ${{ matrix.node-version }}
             vscode-version: ${{ matrix.vscode-version }}
+            bricks_arch: ${{ matrix.arch.bricks_arch }}
         secrets: inherit
 
     package:
@@ -37,13 +42,20 @@ jobs:
 
             - run: yarn install --immutable
 
+            - run: yarn run package:cli:fetch
+              working-directory: packages/databricks-vscode
+              env:
+                  # TODO: Remove this once the bricks repo is public
+                  GH_TOKEN: ${{ secrets.DECO_GITHUB_TOKEN }}
+                  BRICKS_ARCH: darwin_amd64
+
             - name: Building packages
               run: yarn run build
 
             - run: mkdir -p packages/databricks-vscode/artifacts
 
             - name: Build VSIX
-              run: yarn workspace databricks package -o artifacts
+              run: yarn workspace databricks package -o artifacts -t darwin-x64
 
             - name: Upload artifacts
               uses: actions/upload-artifact@v3
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,6 +12,9 @@ on:
             vscode-version:
                 required: true
                 type: string
+            bricks_arch:
+                required: true
+                type: string
 
 jobs:
     test-sdk:
@@ -26,6 +29,7 @@ jobs:
             DATABRICKS_HOST: ${{ secrets.DATABRICKS_HOST }}
             DATABRICKS_TOKEN: ${{ secrets.DATABRICKS_TOKEN }}
             TEST_DEFAULT_CLUSTER_ID: ${{ secrets.TEST_DEFAULT_CLUSTER_ID }}
+
         steps:
             - uses: actions/checkout@v3
 
@@ -73,6 +77,7 @@ jobs:
             DATABRICKS_HOST: ${{ secrets.DATABRICKS_HOST }}
             DATABRICKS_TOKEN: ${{ secrets.DATABRICKS_TOKEN }}
             TEST_DEFAULT_CLUSTER_ID: ${{ secrets.TEST_DEFAULT_CLUSTER_ID }}
+            BRICKS_ARCH: ${{ inputs.bricks_arch }}
 
         steps:
             - uses: actions/checkout@v3
@@ -89,6 +94,13 @@ jobs:
               run: yarn run test:lint
               working-directory: packages/databricks-vscode
 
+            - name: Fetching Bricks CLI
+              run: yarn run package:cli:fetch
+              working-directory: packages/databricks-vscode
+              env:
+                  # TODO: Remove this once the bricks repo is public
+                  GH_TOKEN: ${{ secrets.DECO_GITHUB_TOKEN }}
+
             - name: Building packages
               run: yarn run build
 
diff --git a/packages/databricks-vscode/package.json b/packages/databricks-vscode/package.json
@@ -435,7 +435,7 @@
     "scripts": {
         "vscode:prepublish": "rm -rf out && yarn run package:compile && yarn run package:copy-webview-toolkit",
         "package": "vsce package",
-        "package:cli:fetch": "bash ./scripts/fetch-bricks-cli.sh v0.0.1 ${BRICKS_ARCH:-}",
+        "package:cli:fetch": "BRICKS_VERSION=v0.0.2 && bash ./scripts/fetch-bricks-cli.sh ${BRICKS_VERSION} ${BRICKS_ARCH:-}",
         "package:cli:link": "rm -f ./bin/bricks && ln -s ../../../../bricks/bricks bin",
         "package:compile": "yarn run esbuild:base --minify",
         "package:copy-webview-toolkit": "cp ./node_modules/@vscode/webview-ui-toolkit/dist/toolkit.js ./out/toolkit.js",
diff --git a/packages/databricks-vscode/scripts/fetch-bricks-cli.sh b/packages/databricks-vscode/scripts/fetch-bricks-cli.sh
@@ -8,13 +8,19 @@ if [ -z "$BRICKS_ARCH" ]; then
     BRICKS_ARCH="$(uname -s | awk '{print tolower($0)}')_$(uname -m)"
 fi
 
-pushd /tmp
-rm -rf bricks_*
-gh release download $BRICKS_VERSION -R databricks/bricks -p "*$BRICKS_ARCH.tar.gz"
-tar -xvf bricks_*_$BRICKS_ARCH.tar.gz
+BRICKS_DIR=$(mktemp -d -t bricks-XXXXXXXXXX)
+pushd $BRICKS_DIR
+gh release download $BRICKS_VERSION -R databricks/bricks -p "*$BRICKS_ARCH.zip"
+unzip bricks_*_$BRICKS_ARCH.zip
+rm bricks_*_$BRICKS_ARCH.zip
+ls
 
 popd
 mkdir -p bin
 cd ./bin
 rm -rf bricks
-mv /tmp/bricks ./
+BRICKS_BINARY=$(cd $BRICKS_DIR && ls bricks*)
+# strip the version from the binary name but keep exe on Windows
+BRICKS_TARGET_NAME=$(echo $BRICKS_BINARY | sed -E 's/(.*)_v[0-9]\.[0-9]\.[0-9](\.exe)?/\1\2/g')
+mv $BRICKS_DIR/$BRICKS_BINARY $BRICKS_TARGET_NAME
+rm -rf $BRICKS_DIR
diff --git a/packages/databricks-vscode/src/cli/CliWrapper.test.ts b/packages/databricks-vscode/src/cli/CliWrapper.test.ts
@@ -1,12 +1,20 @@
 import * as assert from "assert";
 import {Uri} from "vscode";
 import {SyncDestination} from "../configuration/SyncDestination";
-import {ExtensionContext} from "vscode";
+import {promisify} from "node:util";
+import {execFile as execFileCb} from "node:child_process";
 
 import {CliWrapper} from "./CliWrapper";
-import {mock, spy} from "ts-mockito";
+
+const execFile = promisify(execFileCb);
 
 describe(__filename, () => {
+    it("should embed a working bricks CLI", async () => {
+        let bricksPath = __dirname + "/../../bin/bricks";
+        let result = await execFile(bricksPath, ["--help"]);
+        assert.ok(result.stdout.indexOf("bricks") > 0);
+    });
+
     it("should create sync command", () => {
         const cli = new CliWrapper({
             asAbsolutePath(path: string) {
