diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c0c2596..2f8adb7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,15 +11,16 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} steps: - name: Get tag - run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV + id: tag + run: echo "::set-output name=version::${GITHUB_REF/refs\/tags\//}" - name: Create Release id: create_release uses: actions/create-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: $VERSION - release_name: Release $VERSION + tag_name: ${{ steps.tag.outputs.version }} + release_name: Release ${{ steps.tag.outputs.version }} draft: false prerelease: false release-server: @@ -46,7 +47,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ steps.create_release.outputs.upload_url }} + upload_url: ${{ needs.empty-release.outputs.upload_url }} asset_path: target/release/mcshader-lsp asset_name: mcshader-lsp-${{ matrix.platforms.target }} asset_content_type: application/octet-stream @@ -56,7 +57,6 @@ jobs: steps: - uses: actions/checkout@v2 - run: npm i - - run: npm i -g rollup - uses: HaaLeo/publish-vscode-extension@v0 id: vsce_release with: diff --git a/.vscode/launch.json b/.vscode/launch.json index eabb5a0..5e54c7c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,6 +7,9 @@ "request": "launch", "name": "Launch Client", "runtimeExecutable": "${execPath}", + "env": { + "MCSHADER_DEBUG": "true" + }, "args": ["--extensionDevelopmentPath=${workspaceRoot}"], "outFiles": ["${workspaceRoot}/client/out/**/*.js"], "preLaunchTask": { diff --git a/README.md b/README.md index 0fd4c9b..2465d12 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ Please see [CONTRIBUTING.md](https://github.com/Strum355/mcshader-lsp/blob/maste - Multi-workspaces (currently only one is supported and using multiple is very undefined behaviour) - Warnings for unused uniforms/varyings - Lint for all #define value combinations +- Compute shader support - Some cool `DRAWBUFFERS` stuff Got a feature request? Chuck it into an Issue! diff --git a/client/package.json b/client/package.json index f2b4954..735890c 100644 --- a/client/package.json +++ b/client/package.json @@ -1,7 +1,8 @@ { "name": "vscode-mc-shader-client", "scripts": { - "compile": "tsc -p ./" + "compile": "tsc -p ./", + "rollup": "rollup -c" }, "dependencies": { "adm-zip": "^0.4.14", diff --git a/package-lock.json b/package-lock.json index 640ecda..6825759 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "vscode-mc-shader", - "version": "1.0.0-unreleased", + "version": "0.9.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 96d4aa5..d460709 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-mc-shader", "displayName": "Minecraft GLSL Shaders", "description": "A Visual Studio Code extension for linting/etc Minecraft GLSL Shaders", - "version": "1.0.0-unreleased", + "version": "0.9.0", "publisher": "Strum355", "author": "Noah Santschi-Cooney (Strum355)", "license": "MIT", @@ -65,10 +65,10 @@ } }, "scripts": { - "vscode:prepublish": "npm run compile && cd client && rollup -c", + "vscode:prepublish": "npm run compile && cd client && npm run rollup", "compile": "tsc -b", "package": "vsce package -o vscode-mc-shader.vsix", - "watch": "concurrently \"tsc -b -w\" \"cd server && MCSHADER_DEBUG=true cargo watch -x build\"", + "watch": "concurrently \"tsc -b -w\" \"cd server && cargo watch -x build\"", "postinstall": "cd client && npm install", "lint": "eslint 'client/**/*.ts' --max-warnings 1", "fix": "eslint 'client/**/*.ts' --fix"