Merge pull request #50 from SpontanCombust:dev

v0.4.0

.github/workflows/build-and-test.yml

@@ -19,11 +19,20 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Use Rust stable
+    - name: Setup Rust
       uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
-    - name: Build with Cargo
+    - name: Setup npm
+      uses: actions/setup-node@v4
+
+    - name: Build Rust code
       run: cargo build --release --workspace
-    - name: Run tests
-      run: cargo test --verbose
+    - name: Run Rust tests
+      run: cargo test --verbose
+
+    - name: Check VSCode client
+      working-directory: 'editors/vscode'
+      run: |
+        npm ci
+        npm run check

.github/workflows/draft-release.yml

@@ -8,6 +8,9 @@ env:
   CARGO_TERM_COLOR: always
   IS_PRE_RELEASE: ${{ contains(github.ref_name, 'dev') }}
 
+permissions:
+  issues: write
+
 jobs:
   build:
     strategy:
@@ -37,8 +40,10 @@ jobs:
     - name: Build xtask
       run: cargo build --package xtask --release
 
-    - name: Prepare the server executable
+    - name: Prepare the LSP server executable
       run: cargo xtask prep-server --target ${{ matrix.target }} --release
+    - name: Download rw3d_cli
+      run: cargo xtask prep-rw3d
 
     - name: Package the extension (pre-release)
       if: ${{ env.IS_PRE_RELEASE == 'true' }}
@@ -75,6 +80,17 @@ jobs:
         generateReleaseNotes: true
         prerelease: ${{ env.IS_PRE_RELEASE }}
 
+
+    - name: Require manual approval to upload the extension to marketplaces
+      if: ${{ env.IS_PRE_RELEASE == 'false' }}
+      uses: trstringer/manual-approval@v1
+      with:
+        secret: ${{ github.TOKEN }}
+        approvers: SpontanCombust
+        minimum-approvals: 1
+        issue-title: "Deploying ${{ github.ref_name }} to marketplaces from staging"
+        issue-body: "Please approve or deny the deployment of version ${{ github.ref_name }}."
+
     # The VS Marketplace doesn't yet support pre-release semver versions, sigh....
     # https://code.visualstudio.com/api/working-with-extensions/publishing-extension#prerelease-extensions
     # - name: Upload extension to VSCode Marketplace (pre-release)

.gitignore

@@ -4,7 +4,7 @@
 
 /editors/vscode/node_modules
 /editors/vscode/out
-/editors/vscode/server
+/editors/vscode/deps/**
 *.vsix
 
 /site

.vscode/launch.json

@@ -21,10 +21,10 @@
             "type": "lldb",
             "request": "attach",
             "windows": {
-                "program": "${workspaceFolder}/server/bin/witcherscript-lsp.exe",
+                "program": "${workspaceFolder}/deps/lsp_server/bin/witcherscript-lsp.exe",
             },
             "linux": {
-                "program": "${workspaceFolder}/server/bin/witcherscript-lsp"
+                "program": "${workspaceFolder}/deps/lsp_server/bin/witcherscript-lsp"
             }
         }
     ]