From 9761321fd4a21e6547591c1ebfd53057a85c3b53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= <maxime.denes@inria.fr>
Date: Fri, 18 Aug 2023 16:49:38 +0200
Subject: [PATCH] Fix marketplace & open-vsx publication

---
 .github/workflows/cd.yml | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 1c384c26a..e87f4a953 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -2,11 +2,12 @@ on:
   release:
     types:
     - published
+  pull_request:
 
 jobs:
   publish-extension:
     runs-on: ubuntu-latest
-    if: success() && startsWith(github.ref, 'refs/tags/')
+    #if: success() && startsWith(github.ref, 'refs/tags/')
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -23,42 +24,15 @@ jobs:
       id: publishToOpenVSX
       with:
         pat: ${{ secrets.OVSX_PAT }}
+        packagePath: ./client/
         yarn: true
         preRelease: true
     - name: Publish to Visual Studio Marketplace
       uses: HaaLeo/publish-vscode-extension@v1
       with:
         pat: ${{ secrets.VSCE_PAT }}
+        packagePath: ./client/
         registryUrl: https://marketplace.visualstudio.com
         extensionFile: ${{ steps.publishToOpenVSX.outputs.vsixPath }}
         yarn: true
         preRelease: true
-
-  publish-opam-package:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        ocaml-compiler: [4.14.x]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Use OCaml ${{ matrix.ocaml-compiler }}
-      uses: avsm/setup-ocaml@v2
-      with:
-        ocaml-compiler: ${{ matrix.ocaml-compiler }}
-
-    - name: Install opam-publish # 2.0.3 because more recent versions do not respect OPAMYES
-      run: opam install -y -j 2 opam-publish=2.0.3
-
-    - name: Inject slug/short variables
-      uses: rlespinasse/github-slug-action@v4
-
-    - name: Publish
-      run: |
-        eval $(opam env)
-        VERSION_SLUG="${GITHUB_REF_SLUG#v}"
-        VERSION="${GITHUB_REF#v}"
-        cd language-server
-        opam publish --no-browser --repo=coq/opam-coq-archive --packages-directory=extra-dev/packages -v $VERSION https://github.com/coq-community/vscoq/releases/download/$GITHUB_REF/vscoq-language-server-$VERSION_SLUG.tar.gz vscoq-language-server.opam