Fix version for PyPI (#36)

* Fix version for PyPI

* Trigger on release

* Remove whitespace

* Use release tag and fix plugin version

.github/workflows/publish-jetbrains.yml

@@ -1,18 +1,13 @@
 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:
     - ".github/workflows/publish-jetbrains.yml"
     - "client/intellij/**"
 
-
 jobs:
   publish-jetbrains:
     name: Publish release to JetBrains Marketplace
@@ -30,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 }}

.github/workflows/publish-pypi.yml

@@ -1,18 +1,13 @@
 name: Build and Publish to PyPI
 
 on:
-  push:
-    branches: [master]
-    paths:
-    - ".github/workflows/publish-pypi.yml"
-    - "server/**"
+  release:
   pull_request:
     branches: [master]
     paths:
     - ".github/workflows/publish-pypi.yml"
     - "server/**"
 
-
 jobs:
   publish-pypi:
     name: Upload release to PyPI
@@ -25,6 +20,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
 
     - name: Set up Python
       uses: actions/setup-python@v5
@@ -36,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

.github/workflows/publish-vscode.yml

@@ -1,18 +1,13 @@
 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:
     - ".github/workflows/publish-vscode.yml"
     - "client/vscode/**"
 
-
 jobs:
   publish-vscode:
     name: Publish release to VS Code Marketplace
@@ -33,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 }}

client/intellij/src/main/resources/META-INF/plugin.xml

@@ -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>