From b4b3bcede6342c0a02a1eb7e14c27b40065baaaa Mon Sep 17 00:00:00 2001
From: Lev Vereshchagin <mail@vrslev.com>
Date: Tue, 8 Oct 2024 13:07:13 +0300
Subject: [PATCH] Use setup-uv action (#61)

---
 .github/workflows/publish-package.yml         | 12 ++---
 .../workflows/publish-vscode-extension.yml    |  8 ++--
 .github/workflows/test.yml                    | 48 +++++++------------
 Justfile                                      |  5 ++
 4 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml
index 81cce77..d8aac93 100644
--- a/.github/workflows/publish-package.yml
+++ b/.github/workflows/publish-package.yml
@@ -10,15 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-      - uses: actions/cache@v4
-        with:
-          path: ~/.cache/uv
-          key: publish-${{ hashFiles('pyproject.toml') }}
       - uses: extractions/setup-just@v2
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+          cache-dependency-glob: "**/pyproject.toml"
       - run: just publish-package
         env:
           PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
diff --git a/.github/workflows/publish-vscode-extension.yml b/.github/workflows/publish-vscode-extension.yml
index 35201de..f30589e 100644
--- a/.github/workflows/publish-vscode-extension.yml
+++ b/.github/workflows/publish-vscode-extension.yml
@@ -11,9 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: extractions/setup-just@v2
       - uses: actions/setup-node@v4
         with:
           node-version: 20
-      - run: npm version ${{ github.event.inputs.version }} --no-git-tag-version
-      - run: npm ci
-      - run: npx @vscode/vsce publish --pat ${{ secrets.VSCODE_MARKETPLACE_TOKEN }}
+      - run: just publish-vscode-extension
+        env:
+          NEW_EXTENSION_VERSION: ${{ github.event.inputs.version }}
+          VSCODE_MARKETPLACE_TOKEN: ${{ secrets.VSCODE_MARKETPLACE_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9699a70..03e266f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,38 +11,27 @@ concurrency:
   group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-env:
-  DEFAULT_PYTHON_VERSION: "3.12"
-
 jobs:
   check-types-py:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
-      - uses: actions/cache@v4
-        with:
-          path: ~/.cache/uv
-          key: check-types-${{ hashFiles('pyproject.toml') }}
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
       - uses: extractions/setup-just@v2
+      - uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+          cache-dependency-glob: "**/pyproject.toml"
       - run: just check-types
 
   lint-py:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
-      - uses: actions/cache@v4
-        with:
-          path: ~/.cache/uv
-          key: lint-${{ hashFiles('pyproject.toml') }}
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
       - uses: extractions/setup-just@v2
+      - uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+          cache-dependency-glob: "**/pyproject.toml"
       - run: just lint
 
   test-py:
@@ -56,29 +45,26 @@ jobs:
           - "3.12"
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - uses: actions/cache@v4
-        with:
-          path: ~/.cache/uv
-          key: ${{ github.job }}-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }}
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
       - uses: extractions/setup-just@v2
+      - uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+          cache-dependency-glob: "**/pyproject.toml"
+      - run: uv python install ${{ matrix.python-version }}
       - run: just test
 
   check-types-ts:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: extractions/setup-just@v2
       - uses: actions/setup-node@v4
-      - run: npm ci
-      - run: npm run compile
+      - run: just install-ts check-types-ts
 
   lint-ts:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: extractions/setup-just@v2
       - uses: actions/setup-node@v4
-      - run: npm ci
-      - run: npm run lint
+      - run: just install-ts lint-ts
diff --git a/Justfile b/Justfile
index ade01a7..6abb391 100644
--- a/Justfile
+++ b/Justfile
@@ -32,3 +32,8 @@ check-types-ts:
 
 lint-ts:
     npm run lint
+
+publish-vscode-extension:
+    npm version $NEW_EXTENSION_VERSION --no-git-tag-version
+    npm ci
+    npx @vscode/vsce publish --pat $VSCODE_MARKETPLACE_TOKEN