merge: PR #175 from chore/171-refactor-lsp-and-wasm-handling-staging

Author: 0xmemorygrinder

.github/workflows/cd.yml

@@ -26,14 +26,50 @@ jobs:
     with:
       from: ${{ github.sha }}
       since: ${{ needs.find-last-commit.outputs.commit }}
+  
+  publish-libraries:
+    runs-on: ubuntu-latest
+    needs: setup
+    strategy:
+      matrix:
+        workspace: ${{ fromJson(needs.setup.outputs.extensions)}}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.16.1'
+
+      - id: setup-yarn
+        # Install yarn 3 & workspace-tools
+        run: |
+          corepack enable
+          corepack prepare yarn@stable --activate
+          yarn -v
+
+      - name: Install dependencies
+        run: |
+          yarn install --immutable
+          cargo install wasm-pack
+
+      - name: Build
+        run: |
+          yarn workspace ${{ matrix.workspace.name }} build
 
+      - name: Publish
+        run: yarn workspace ${{ matrix.workspace.name }} run publish 
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
 
   publish:
     runs-on: ubuntu-latest
-    needs: setup
+    needs: 
+      - setup
+      - publish-libraries
     strategy:
       matrix:
-        workspace: ${{ fromJson(needs.setup.outputs.extensions)}}
+        workspace: ${{ fromJson(needs.setup.outputs.libraries)}}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -48,7 +84,6 @@ jobs:
           corepack enable
           corepack prepare yarn@stable --activate
           yarn -v
-          yarn plugin import workspace-tools
 
       - name: Get workspace path
         id: workspace-path
@@ -108,6 +143,7 @@ jobs:
       - name: Install dependencies
         run: |
           yarn install --immutable
+          cargo install wasm-pack
 
       - name: Build
         run: |
@@ -117,6 +153,8 @@ jobs:
         run: yarn workspace ${{ matrix.workspace.name }} run publish ${{ github.ref_name == 'dev' && '--pre-release' || '' }} ${{ steps.tag.outputs.result }}
         env:
           VSCE_PAT: ${{ secrets.VSCE_PAT }}
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+
 
       #- name: Run latest-tag
       #  uses: EndBug/latest-tag@latest

.github/workflows/ci.yml

@@ -51,7 +51,6 @@ jobs:
         run: |
           corepack enable
           corepack prepare yarn@stable --activate
-          yarn plugin import workspace-tools
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -87,7 +86,6 @@ jobs:
         run: |
           corepack enable
           corepack prepare yarn@stable --activate
-          yarn plugin import workspace-tools
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -120,7 +118,9 @@ jobs:
         run: |
           corepack enable
           corepack prepare yarn@stable --activate
-          yarn plugin import workspace-tools
+
+      - name: install
+        run: cargo install wasm-pack
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -153,7 +153,6 @@ jobs:
         run: |
           corepack enable
           corepack prepare yarn@stable --activate
-          yarn plugin import workspace-tools
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

.github/workflows/detect-workspace-changes.yml

@@ -53,7 +53,6 @@ jobs:
           corepack enable
           corepack prepare yarn@stable --activate
           yarn -v
-          yarn plugin import workspace-tools
       - name: Get yarn workspaces output
         id: raw-workspaces-list
         run: |
@@ -81,11 +80,6 @@ jobs:
               }
             })
             console.log(affectedWorkspaces)
-            const toolchainsWorkspaces = affectedWorkspaces.filter(workspace => {
-              return workspace.name.match(/^osmium-(?!manager)[^-\s]+$/)
-            }).map(workspace => ({
-                name: workspace.name
-            }))
             const librariesWorkspaces = affectedWorkspaces.filter(workspace => {
               return workspace.name.startsWith('@osmium-libs/')
             }).map(workspace => ({
@@ -97,18 +91,18 @@ jobs:
                 name: workspace.name
             }))
             const extensionsWorkspaces = affectedWorkspaces.filter(workspace => {
-              return workspace.name.match(/^osmium-(?:manager|(?!\w+-\w+-\w+)(?:\w+-\w+))$/)
+              return workspace.name.match(/^osmium-(?:manager|(?!\w+-\w+)(?:\w+))$/)
             }).map(workspace => ({
                 name: workspace.name
             }))
             const extensionsFoldersWorkspaces = affectedWorkspaces.filter(workspace => {
-              return workspace.name.match(/^osmium-\w+-\w+-\w+$/)
+              return workspace.name.match(/^osmium-\w+-\w+$/)
             }).map(workspace => ({
                 name: workspace.name
             }))
 
             const missingExtensionsWorkspaces = extensionsFoldersWorkspaces.map(workspaceFolder => {
-              const extensionName = workspaceFolder.name.split('-').slice(0, 3).join('-')
+              const extensionName = workspaceFolder.name.split('-').slice(0, 2).join('-')
               const extensionWorkspace = extensionsWorkspaces.find(workspace => {
                 return workspace.name === extensionName
               })
@@ -129,7 +123,6 @@ jobs:
 
             return {
               affectedWorkspaces,
-              toolchainsWorkspaces,
               extensionsWorkspaces: completeExtensionsWorkspaces,
               librariesWorkspaces,
               packagesWorkspaces
@@ -139,8 +132,6 @@ jobs:
         run: |
           echo "Affected workspaces: ${{ toJson(fromJson(steps.build-array.outputs.result).affectedWorkspaces) }}"
           echo "------------------------------------"
-          echo "Toolchains workspaces: ${{ toJson(fromJson(steps.build-array.outputs.result).toolchainsWorkspaces) }}"
-          echo "------------------------------------"
           echo "Extensions workspaces: ${{ toJson(fromJson(steps.build-array.outputs.result).extensionsWorkspaces) }}"
           echo "------------------------------------"
           echo "Libraries workspaces: ${{ toJson(fromJson(steps.build-array.outputs.result).librariesWorkspaces) }}"