Merge branch 'main' into fix/update-node

sublimelsp · Oct 20, 2024 · 9d40a06 · 9d40a06
2 parents 60ce170 + 3900b94
commit 9d40a06
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml
@@ -27,14 +27,35 @@ jobs:
         with:
           node-version: '18'
       - uses: actions/checkout@v4
-      - if: ${{ matrix.os == 'macOS-latest' }}
-        run: brew unlink openssl
       - uses: SublimeText/UnitTesting/actions/setup@v1
         with:
           sublime-text-version: 4
           extra-packages: |
             sublimelsp/LSP@main
             sublimelsp/LSP-pyright@master
+      - name: Overwrite installed dependency with local version
+        shell: bash
+        run: |
+          # $PACKAGE is exposed from the setup step.
+
+          case ${{ runner.os }} in
+            Linux)
+              ST_LIBS_DIR="$HOME/.config/sublime-text/Lib/python38";;
+            macOS)
+              ST_LIBS_DIR="$HOME/Library/Application Support/Sublime Text/Lib/python38";;
+            Windows)
+              ST_LIBS_DIR="/c/st/Data/Lib/python38/";;
+            *)
+              exit 1
+          esac
+
+          cd ./
+          # detached head will crash package control
+          rm -rf "./.git"
+          echo "Overwriting installed dependency in $ST_LIBS_DIR/$PACKAGE"
+          rm -rf "$ST_LIBS_DIR/$PACKAGE"
+          mv "./st3/$PACKAGE" "$ST_LIBS_DIR"
+          cd -
       - uses: SublimeText/UnitTesting/actions/run-tests@v1
 
   Lint:

diff --git a/.python-version b/.python-version
@@ -0,0 +1 @@
+3.8