Merge pull request #754 from redanaheim/main

Fix issue with build using flake system in issue #747

.github/workflows/ci.yml

@@ -43,6 +43,11 @@ jobs:
     - uses: cachix/install-nix-action@v22
       with:
         nix_path: nixpkgs=channel:nixos-unstable
+    - name: Check each yarn.nix up to date
+      run: |
+        cd client && nix-shell -p yarn2nix --run "yarn2nix > new_yarn.nix" && diff new_yarn.nix yarn.nix
+        cd goal-view-ui && nix-shell -p yarn2nix --run "yarn2nix > new_yarn.nix" && diff new_yarn.nix yarn.nix
+        cd ../search-ui && nix-shell -p yarn2nix --run "yarn2nix > new_yarn.nix" && diff new_yarn.nix yarn.nix
     - run: nix develop .#vscoq-language-server-${{ matrix.coq }} -c bash -c "cd language-server && dune build"
     - run: nix develop .#vscoq-client -c bash -c "cd client && yarn run install:all && yarn run build:all && yarn run compile"
     - run: xvfb-run nix develop .#vscoq-client -c bash -c "cd client && yarn test"
@@ -199,10 +204,14 @@ jobs:
       uses: actions/setup-node@v3
       with:
         node-version: 16.x
-    - name: Publish on VsCode marketplace
+    - name: Copy licences
       run: |
         cd client
         cp ../LICENSE . && cp ../README.md .
+    - name: Pre publish phase
+      run: |
+        cd client
+        yarn run package
     - name: Publish to Open VSX Registry
       uses: HaaLeo/[email protected]
       id: publishToOpenVSX

.github/workflows/publish-extension.yml

@@ -15,10 +15,14 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 16.x
-      - name: Publish on VsCode marketplace
+      - name: Copy licences
         run: |
           cd client
           cp ../LICENSE . && cp ../README.md .
+      - name: Pre publish phase
+        run: |
+          cd client
+          yarn run package
       - name: Publish to Open VSX Registry
         uses: HaaLeo/[email protected]
         id: publishToOpenVSX

.gitignore

@@ -5,3 +5,5 @@ language-server/_build
 client/yarn-error.log
 client/.vscode-test/
 client/out/
+.DS_Store
+result

client/package.json

@@ -731,7 +731,6 @@
     "start:search-ui": "cd search-ui && yarn run start",
     "build:search-ui": "cd search-ui && yarn run build",
     "build:dev:search-ui": "cd search-ui && yarn run build:dev",
-    "vscode:prepublish": "yarn run package",
     "compile": "webpack",
     "watch": "webpack --watch",
     "package": "yarn run install:all && yarn run build:all && webpack --mode production --devtool hidden-source-map",

client/src/extension.ts

@@ -91,7 +91,7 @@ export function activate(context: ExtensionContext) {
     const vscoq1 = extensions.getExtension("coq-community.vscoq1");
     if (vscoq1) {
         if (vscoq1.isActive) {
-            const message = "VsCoq2 is incompatible with VsCoq1 it is recommended that you disable one of them.";
+            const message = "VsCoq2 is incompatible with VsCoq1. it is recommended that you disable one of them.";
             window.showErrorMessage(message, { title: "Disable VsCoq1", id: 0 }, { title: "Disable VsCoq2", id: 1 })
                 .then(act => {
                     if (act?.id === 0) {