Merge branch 'main' of https://github.com/house-of-abbey/scratch_vhdl

house-of-abbey · May 24, 2024 · 8ea7e47 · 8ea7e47
2 parents 38dafd5 + a6dd5c5
commit 8ea7e47
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -43,16 +43,20 @@ jobs:
           dependencies: false
           packagePath: ./scratch-vhdl-vscode
           dryRun: true
-          pat: ""
+          pat: "none"
+      - name: "Move"
+        run: |
+          mv ${{ steps.package.outputs.vsixPath }} /tmp/scratch-vhdl-vscode.vsix
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          path: ${{ steps.build.outputs.vsixPath }}
+          path: /tmp/scratch-vhdl-vscode.vsix
   deploy-github:
     runs-on: ubuntu-latest
+    needs: build
     environment:
       name: github-release
-      url: https://open-vsx.org/extension/JosephAbbey/scratch-vhdl-vscode
+      url: https://github.com/house-of-abbey/scratch_vhdl/releases/latest
     steps:
       - name: Download Artifact
         uses: actions/download-artifact@v4
@@ -77,11 +81,12 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ steps.download.outputs.download-path }}
+          asset_path: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode.vsix
           asset_name: scratch-vhdl-vscode.vsix
           asset_content_type: application/zip
   deploy-open-vsx:
     runs-on: ubuntu-latest
+    needs: build
     environment:
       name: open-vsx
       url: https://open-vsx.org/extension/JosephAbbey/scratch-vhdl-vscode
@@ -94,10 +99,11 @@ jobs:
       - name: Publish to Open VSX Registry
         uses: HaaLeo/publish-vscode-extension@v1
         with:
-          extensionFile: ${{ steps.download.outputs.download-path }}
+          extensionFile: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode.vsix
           pat: ${{ secrets.OPEN_VSX_TOKEN }}
   deploy-visual-studio:
     runs-on: ubuntu-latest
+    needs: build
     environment:
       name: visual-studio
       url: https://marketplace.visualstudio.com/items?itemName=JosephAbbey.scratch-vhdl-vscode
@@ -111,5 +117,5 @@ jobs:
         uses: HaaLeo/publish-vscode-extension@v1
         with:
           registryUrl: https://marketplace.visualstudio.com
-          extensionFile: ${{ steps.download.outputs.download-path }}
+          extensionFile: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode.vsix
           pat: ${{ secrets.VISUAL_STUDIO_TOKEN }}
diff --git a/scratch-vhdl-vscode/package.json b/scratch-vhdl-vscode/package.json
@@ -8,14 +8,12 @@
   "publisher": "JosephAbbey",
   "displayName": "Scratch VHDL",
   "description": "",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "license": "MIT",
   "engines": {
     "vscode": "^1.75.0"
   },
-  "categories": [
-    "Other"
-  ],
+  "categories": ["Other"],
   "repository": {
     "type": "git",
     "url": "https://github.com/house-of-abbey/scratch_vhdl"
@@ -63,22 +61,15 @@
     "languages": [
       {
         "id": "javascript",
-        "extensions": [
-          ".sbi"
-        ]
+        "extensions": [".sbi"]
       },
       {
         "id": "json",
-        "extensions": [
-          ".sbd",
-          ".sbe"
-        ]
+        "extensions": [".sbd", ".sbe"]
       },
       {
         "id": "customasm",
-        "extensions": [
-          ".asm"
-        ]
+        "extensions": [".asm"]
       }
     ],
     "jsonValidation": [
@@ -131,4 +122,4 @@
     "@vscode/webview-ui-toolkit": "^1.2.2",
     "blockly": "^10.1.3"
   }
-}
+}