From 4ba0f5b0626eac728f272b69d78cb6c6eb38e36b Mon Sep 17 00:00:00 2001 From: Lev Vereshchagin Date: Tue, 8 Oct 2024 12:51:44 +0300 Subject: [PATCH 1/6] Use uv in test workflow --- .github/workflows/publish-package.yml | 2 +- .github/workflows/test.yml | 37 +++++++-------------------- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index 81cce77..769a92f 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -4,7 +4,7 @@ on: release: types: - published - +#TODO:uv jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9699a70..99b3e54 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,22 +11,14 @@ 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 + - uses: astral-sh/setup-uv@v3 with: - path: ~/.cache/uv - key: check-types-${{ hashFiles('pyproject.toml') }} - - run: curl -LsSf https://astral.sh/uv/install.sh | sh + enable-cache: true - uses: extractions/setup-just@v2 - run: just check-types @@ -34,14 +26,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - uses: astral-sh/setup-uv@v3 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 + enable-cache: true - uses: extractions/setup-just@v2 - run: just lint @@ -56,14 +43,10 @@ jobs: - "3.12" steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - uses: actions/cache@v4 + - uses: astral-sh/setup-uv@v3 with: - path: ~/.cache/uv - key: ${{ github.job }}-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }} - - run: curl -LsSf https://astral.sh/uv/install.sh | sh + enable-cache: true + - run: uv python install {{ matrix.python-version }} - uses: extractions/setup-just@v2 - run: just test @@ -72,13 +55,11 @@ jobs: steps: - uses: actions/checkout@v4 - 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: actions/setup-node@v4 - - run: npm ci - - run: npm run lint + - run: just install-ts lint-ts From f756a0c04be7800d1a8bbda9f9b7529ca1eb671f Mon Sep 17 00:00:00 2001 From: Lev Vereshchagin Date: Tue, 8 Oct 2024 12:53:18 +0300 Subject: [PATCH 2/6] Fix cache key --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 99b3e54..35407e5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,6 +19,7 @@ jobs: - uses: astral-sh/setup-uv@v3 with: enable-cache: true + cache-dependency-glob: "**/pyproject.toml" - uses: extractions/setup-just@v2 - run: just check-types @@ -29,6 +30,7 @@ jobs: - uses: astral-sh/setup-uv@v3 with: enable-cache: true + cache-dependency-glob: "**/pyproject.toml" - uses: extractions/setup-just@v2 - run: just lint @@ -46,6 +48,7 @@ jobs: - uses: astral-sh/setup-uv@v3 with: enable-cache: true + cache-dependency-glob: "**/pyproject.toml" - run: uv python install {{ matrix.python-version }} - uses: extractions/setup-just@v2 - run: just test From adca7c9fac73991275b504a034136fb16de58840 Mon Sep 17 00:00:00 2001 From: Lev Vereshchagin Date: Tue, 8 Oct 2024 12:54:14 +0300 Subject: [PATCH 3/6] update --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 35407e5..46faa86 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,7 +49,7 @@ jobs: with: enable-cache: true cache-dependency-glob: "**/pyproject.toml" - - run: uv python install {{ matrix.python-version }} + - run: uv python install ${{ matrix.python-version }} - uses: extractions/setup-just@v2 - run: just test From 30e39fd092884ec76e839ea14815cd050317cd65 Mon Sep 17 00:00:00 2001 From: Lev Vereshchagin Date: Tue, 8 Oct 2024 12:55:06 +0300 Subject: [PATCH 4/6] Update --- .github/workflows/test.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 46faa86..03e266f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,22 +16,22 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - uses: extractions/setup-just@v2 - uses: astral-sh/setup-uv@v3 with: enable-cache: true cache-dependency-glob: "**/pyproject.toml" - - uses: extractions/setup-just@v2 - run: just check-types lint-py: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - uses: extractions/setup-just@v2 - uses: astral-sh/setup-uv@v3 with: enable-cache: true cache-dependency-glob: "**/pyproject.toml" - - uses: extractions/setup-just@v2 - run: just lint test-py: @@ -45,18 +45,19 @@ jobs: - "3.12" steps: - uses: actions/checkout@v4 + - 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 }} - - uses: extractions/setup-just@v2 - 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: just install-ts check-types-ts @@ -64,5 +65,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - uses: extractions/setup-just@v2 - uses: actions/setup-node@v4 - run: just install-ts lint-ts From 350b5a105b2440f0a6a51aa48944db3edd5a6661 Mon Sep 17 00:00:00 2001 From: Lev Vereshchagin Date: Tue, 8 Oct 2024 13:06:17 +0300 Subject: [PATCH 5/6] Update publish-package workflow --- .github/workflows/publish-package.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index 769a92f..d8aac93 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -4,21 +4,17 @@ on: release: types: - published -#TODO:uv + jobs: publish: 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 }} From 405e3c53c8afbbe7b01ad7030d47e7cd773cad90 Mon Sep 17 00:00:00 2001 From: Lev Vereshchagin Date: Tue, 8 Oct 2024 13:06:31 +0300 Subject: [PATCH 6/6] Move commands from publish-vscode-extension to justfile --- .github/workflows/publish-vscode-extension.yml | 8 +++++--- Justfile | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) 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/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