From ec2d2000369f104d77ef401baa88a631fcc77446 Mon Sep 17 00:00:00 2001
From: Dhruv Manilawala <dhruvmanila@gmail.com>
Date: Wed, 11 Sep 2024 00:10:31 +0530
Subject: [PATCH 1/2] Separate publish steps for Code Marketplace and OpenVSX
 (#614)

## Summary

Publishing the extension to the OpenVSX registry fails a lot of times
and there's no way to re-run just the publish step for the OpenVSX in
GitHub Actions, we can only re-run the entire workflow. This PR
separates the publish step into two where (1) would publish to Code
Marketplace and (2) would publish to OpenVSX registry. This means that
if we fail to publish to one of the registry, we could still re-run it.

### Limitation

Sometimes it does happen that only some of the artifacts are published
and not all of them in which case re-running won't solve this issue. I
don't really have a good solution here.
---
 .github/workflows/release.yaml | 61 ++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index e046072..41b0748 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -166,8 +166,8 @@ jobs:
           path: ./dist
 
   # Phase 3: Publish the built extension to the Marketplace.
-  publish:
-    name: "Publish"
+  publish-code-marketplace:
+    name: "Publish (Code Marketplace)"
     needs: ["build"]
     runs-on: ubuntu-latest
     steps:
@@ -231,6 +231,63 @@ jobs:
         if: "!startsWith(github.ref, 'refs/tags/')"
         run: npx vsce publish --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ./dist/ruff-*.vsix --pre-release
 
+  publish-openvsx:
+    name: "Publish (OpenVSX)"
+    needs: ["build"]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Nodejs
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: ${{ env.FETCH_DEPTH }}
+
+      # Download all built artifacts.
+      - uses: actions/download-artifact@v3
+        with:
+          name: dist-aarch64-apple-darwin
+          path: dist
+      - uses: actions/download-artifact@v3
+        with:
+          name: dist-x86_64-apple-darwin
+          path: dist
+      - uses: actions/download-artifact@v3
+        with:
+          name: dist-x86_64-unknown-linux-gnu
+          path: dist
+      - uses: actions/download-artifact@v3
+        with:
+          name: dist-aarch64-unknown-linux-gnu
+          path: dist
+      - uses: actions/download-artifact@v3
+        with:
+          name: dist-arm-unknown-linux-gnueabihf
+          path: dist
+      - uses: actions/download-artifact@v3
+        with:
+          name: dist-x86_64-pc-windows-msvc
+          path: dist
+      - uses: actions/download-artifact@v3
+        with:
+          name: dist-aarch64-pc-windows-msvc
+          path: dist
+      - uses: actions/download-artifact@v3
+        with:
+          name: dist-x86_64-unknown-linux-musl
+          path: dist
+      - uses: actions/download-artifact@v3
+        with:
+          name: dist-aarch64-unknown-linux-musl
+          path: dist
+      - run: ls -al ./dist
+
+      # Install Node dependencies.
+      - run: npm ci
+
       # Publish to OpenVSX.
       - name: Publish Extension (OpenVSX, release)
         if: "startsWith(github.ref, 'refs/tags/')"

From f98e59d7f7c43126784b5379f893b125f1eb7fc7 Mon Sep 17 00:00:00 2001
From: Dhruv Manilawala <dhruvmanila@gmail.com>
Date: Wed, 11 Sep 2024 00:16:34 +0530
Subject: [PATCH 2/2] Bump version to 2024.48.0 (#615)

---
 CHANGELOG.md      | 9 +++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 pyproject.toml    | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 318c3b2..f7df2a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 See [here](https://github.com/astral-sh/ruff/releases) for the Ruff release notes.
 
+## 2024.48.0
+
+This previous release failed to publish the artifacts to the Open VSX registry. This
+release is a re-release of `2024.46.0` to ensure that users of that registry aren't affected.
+Additionally, the publish step has been split into two separate steps to avoid the issue
+in the future.
+
+**Full Changelog**: https://github.com/astral-sh/ruff-vscode/compare/2024.46.0...2024.48.0
+
 ## 2024.46.0
 
 This release fixes a regression from the last release where the loading spinner would not disappear after
diff --git a/package-lock.json b/package-lock.json
index 88abaac..84fac9a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ruff",
-  "version": "2024.46.0",
+  "version": "2024.48.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ruff",
-      "version": "2024.46.0",
+      "version": "2024.48.0",
       "license": "MIT",
       "dependencies": {
         "@vscode/python-extension": "^1.0.5",
diff --git a/package.json b/package.json
index b28369d..ce0c4fd 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "ruff",
   "displayName": "Ruff",
   "description": "A Visual Studio Code extension with support for the Ruff linter.",
-  "version": "2024.46.0",
+  "version": "2024.48.0",
   "serverInfo": {
     "name": "Ruff",
     "module": "ruff"
diff --git a/pyproject.toml b/pyproject.toml
index 1059b64..b1723f9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ruff-vscode"
-version = "2024.46.0"
+version = "2024.48.0"
 description = "A Visual Studio Code extension with support for the Ruff linter."
 authors = [{ name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" }]
 maintainers = [{ name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" }]

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/astral-sh/ruff-vscode/compare/2024.46.0...2024.48.0.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/astral-sh/ruff-vscode/compare/2024.46.0...2024.48.0.patch" target="_blank">pFad Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/astral-sh/ruff-vscode/compare/2024.46.0...2024.48.0.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/astral-sh/ruff-vscode/compare/2024.46.0...2024.48.0.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>