Skip to content

Commit

Permalink
Use release tag and fix plugin version
Browse files Browse the repository at this point in the history
  • Loading branch information
dinvlad committed Apr 19, 2024
1 parent 971071f commit f3076e1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/publish-jetbrains.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
name: Build and Publish to JetBrains Marketplace

on:
push:
branches: [master]
paths:
- ".github/workflows/publish-jetbrains.yml"
- "client/intellij/**"
release:
pull_request:
branches: [master]
paths:
Expand All @@ -29,6 +25,6 @@ jobs:
java-version: '21'

- name: Publish Plugin
if: github.ref == 'refs/heads/master'
if: github.ref_protected
working-directory: client/intellij
run: ./gradlew publishPlugin -Ptoken=${{ secrets.JETBRAINS_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/publish-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run: python -m pip wheel . --no-deps -w dist

- name: Publish package distributions to PyPI
if: github.ref == 'refs/heads/master'
if: github.ref_protected
uses: pypa/gh-action-pypi-publish@release/v1
with:
packages-dir: server/dist
11 changes: 4 additions & 7 deletions .github/workflows/publish-vscode.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
name: Build and Publish to VS Code Marketplace

on:
push:
branches: [master]
paths:
- ".github/workflows/publish-vscode.yml"
- "client/vscode/**"
release:
pull_request:
branches: [master]
paths:
Expand All @@ -32,5 +28,6 @@ jobs:
run: npm ci

- name: Publish
if: github.ref == 'refs/heads/master'
run: npm run vsce publish -p ${{ secrets.VSCE_TOKEN }}
if: github.ref_protected
run: npm version ${{ github.ref }} &&
npm run vsce publish -p ${{ secrets.VSCE_TOKEN }}
1 change: 1 addition & 0 deletions client/intellij/src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<id>org.broadinstitute.wdl.devtools</id>
<name>WDL DevTools</name>
<vendor url="https://www.broadinstitute.org">Broad Institute</vendor>
<version>@version@</version>

<description>Advanced development tools for Workflow Description Language</description>

Expand Down

0 comments on commit f3076e1

Please sign in to comment.