From 38f0ff13b1237121185e875a1cca7b32e94dd3b6 Mon Sep 17 00:00:00 2001 From: Joseph Abbey Date: Fri, 24 May 2024 19:49:24 +0100 Subject: [PATCH 1/8] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cfc0275..66db05c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -52,7 +52,7 @@ jobs: runs-on: ubuntu-latest 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 From ec5fec5ccda41076246cd8b0ce92b3feda49e5fa Mon Sep 17 00:00:00 2001 From: Joseph Abbey Date: Fri, 24 May 2024 19:53:14 +0100 Subject: [PATCH 2/8] Version bump --- scratch-vhdl-vscode/package.json | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/scratch-vhdl-vscode/package.json b/scratch-vhdl-vscode/package.json index 8b4bbda..06b99fc 100644 --- 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" } -} \ No newline at end of file +} From 6e9253fbc977e0272bebe5964f77af6fd8ba2913 Mon Sep 17 00:00:00 2001 From: Joseph Abbey Date: Fri, 24 May 2024 19:55:01 +0100 Subject: [PATCH 3/8] Update deploy.yml --- .github/workflows/deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 66db05c..6c83ba3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -50,6 +50,7 @@ jobs: path: ${{ steps.build.outputs.vsixPath }} deploy-github: runs-on: ubuntu-latest + needs: build environment: name: github-release url: https://github.com/house-of-abbey/scratch_vhdl/releases/latest @@ -82,6 +83,7 @@ jobs: 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 @@ -98,6 +100,7 @@ jobs: 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 From ba21dd285b8a27871d6adf465b83340f97ff2fee Mon Sep 17 00:00:00 2001 From: Joseph Abbey Date: Fri, 24 May 2024 19:58:08 +0100 Subject: [PATCH 4/8] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6c83ba3..902c7d1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -43,7 +43,7 @@ jobs: dependencies: false packagePath: ./scratch-vhdl-vscode dryRun: true - pat: "" + pat: "none" - name: Upload Artifact uses: actions/upload-artifact@v4 with: From 2bc1afecddb321301d5c8f39bd9aac5be0d5249e Mon Sep 17 00:00:00 2001 From: Joseph Abbey Date: Fri, 24 May 2024 20:03:24 +0100 Subject: [PATCH 5/8] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 902c7d1..849ce7b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,7 +47,7 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - path: ${{ steps.build.outputs.vsixPath }} + path: ${{ steps.package.outputs.vsixPath }} deploy-github: runs-on: ubuntu-latest needs: build From f3260ca10855ede10900614415b185bb5a5dac9e Mon Sep 17 00:00:00 2001 From: Joseph Abbey Date: Fri, 24 May 2024 20:08:17 +0100 Subject: [PATCH 6/8] Update deploy.yml --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 849ce7b..7649661 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -78,7 +78,7 @@ 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-${{ github.ref }}.vsix asset_name: scratch-vhdl-vscode.vsix asset_content_type: application/zip deploy-open-vsx: @@ -96,7 +96,7 @@ 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-${{ github.ref }}.vsix pat: ${{ secrets.OPEN_VSX_TOKEN }} deploy-visual-studio: runs-on: ubuntu-latest @@ -114,5 +114,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-${{ github.ref }}.vsix pat: ${{ secrets.VISUAL_STUDIO_TOKEN }} From 5b99ee6646528892591342b5d509bcbf5dddb3e2 Mon Sep 17 00:00:00 2001 From: Joseph Abbey Date: Fri, 24 May 2024 20:10:54 +0100 Subject: [PATCH 7/8] Update deploy.yml --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7649661..972459c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -78,7 +78,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode-${{ github.ref }}.vsix + asset_path: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode-${{ github.ref_name }}.vsix asset_name: scratch-vhdl-vscode.vsix asset_content_type: application/zip deploy-open-vsx: @@ -96,7 +96,7 @@ jobs: - name: Publish to Open VSX Registry uses: HaaLeo/publish-vscode-extension@v1 with: - extensionFile: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode-${{ github.ref }}.vsix + extensionFile: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode-${{ github.ref_name }}.vsix pat: ${{ secrets.OPEN_VSX_TOKEN }} deploy-visual-studio: runs-on: ubuntu-latest @@ -114,5 +114,5 @@ jobs: uses: HaaLeo/publish-vscode-extension@v1 with: registryUrl: https://marketplace.visualstudio.com - extensionFile: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode-${{ github.ref }}.vsix + extensionFile: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode-${{ github.ref_name }}.vsix pat: ${{ secrets.VISUAL_STUDIO_TOKEN }} From a6dd5c5e8519a8b1816897c99c3ea5c10d1c2447 Mon Sep 17 00:00:00 2001 From: Joseph Abbey Date: Fri, 24 May 2024 20:16:08 +0100 Subject: [PATCH 8/8] Update deploy.yml --- .github/workflows/deploy.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 972459c..be64d50 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -44,10 +44,13 @@ jobs: packagePath: ./scratch-vhdl-vscode dryRun: true 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.package.outputs.vsixPath }} + path: /tmp/scratch-vhdl-vscode.vsix deploy-github: runs-on: ubuntu-latest needs: build @@ -78,7 +81,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode-${{ github.ref_name }}.vsix + 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: @@ -96,7 +99,7 @@ jobs: - name: Publish to Open VSX Registry uses: HaaLeo/publish-vscode-extension@v1 with: - extensionFile: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode-${{ github.ref_name }}.vsix + extensionFile: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode.vsix pat: ${{ secrets.OPEN_VSX_TOKEN }} deploy-visual-studio: runs-on: ubuntu-latest @@ -114,5 +117,5 @@ jobs: uses: HaaLeo/publish-vscode-extension@v1 with: registryUrl: https://marketplace.visualstudio.com - extensionFile: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode-${{ github.ref_name }}.vsix + extensionFile: ${{ steps.download.outputs.download-path }}/scratch-vhdl-vscode.vsix pat: ${{ secrets.VISUAL_STUDIO_TOKEN }}