-

databricks · Feb 22, 2024 · 6a1445f · 6a1445f
1 parent 7beabd1
commit 6a1445f
Showing 1 changed file with 6 additions and 27 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -153,6 +153,10 @@ jobs:
         with:
           path: ./setup-cli
 
+      - name: Assert databricks CLI is not already installed
+        run: ./setup-cli/assert/not-installed.sh
+        shell: bash
+
       - run: curl -fsSL https://raw.githubusercontent.com/databricks/setup-cli/${{ github.sha }}/install.sh | sh
         shell: bash
 
@@ -172,7 +176,6 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: ./setup-cli/assert/path.sh /c/Windows/databricks
 
-
   curl-dbr:
     # All DBR images are built on top of Ubuntu
     runs-on: ubuntu-latest
@@ -182,42 +185,18 @@ jobs:
         with:
           path: ./setup-cli
 
-      - run: curl -fsSL https://raw.githubusercontent.com/databricks/setup-cli/${{ github.sha }}/install.sh | sh
-        shell: bash
-        env:
-          DATABRICKS_RUNTIME_VERSION: value-does-not-matter
-
       # Append ~/bin to the PATH. This helps with the assertions in the next steps.
       - run: echo "PATH=$PATH:$HOME/bin" >> $GITHUB_ENV
 
-      - run: databricks version
-        shell: bash
-
-      - name: Assert the version of the CLI installed
-        run: ./setup-cli/assert/version.sh $(cat ./setup-cli/VERSION)
-        shell: bash
-
-      - name: Assert installation path is ~/bin
-        run: ./setup-cli/assert/path.sh ~/bin/databricks
+      - name: Assert databricks CLI is not already installed
+        run: ./setup-cli/assert/not-installed.sh
         shell: bash
 
-  curl-dbr-main:
-    # All DBR images are built on top of Ubuntu
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          path: ./setup-cli
-
       - run: curl -fsSL https://raw.githubusercontent.com/databricks/setup-cli/${{ github.sha }}/install.sh | sh
         shell: bash
         env:
           DATABRICKS_RUNTIME_VERSION: value-does-not-matter
 
-      # Append ~/bin to the PATH. This helps with the assertions in the next steps.
-      - run: echo "PATH=$PATH:$HOME/bin" >> $GITHUB_ENV
-
       - run: databricks version
         shell: bash