Merge pull request #371 from pkgw/zenodo-back

Re-enable Zenodo deposition
WorldWideTelescope · Dec 14, 2023 · 2c7377b · 2c7377b
2 parents d571485 + 526f5b0
commit 2c7377b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 40 deletions.
diff --git a/ci/azure-deployment.yml b/ci/azure-deployment.yml
@@ -111,35 +111,33 @@ jobs:
     - bash: shred ~/.npmrc
       displayName: Clean up credentials
 
-  # 2023 Nov: temporarily disabling Zenodo; they have just updated their API and broken
-  # everything, and we want to ge a release out.
-  #- job: zenodo_publish
-  #  pool:
-  #    vmImage: ubuntu-latest
-  #  variables:
-  #  - group: Deployment Credentials
-  #
-  #  steps:
-  #  - template: azure-job-setup.yml
-  #    parameters:
-  #      setupCranko: true
-  #
-  #  - bash: |
-  #      set -xeuo pipefail
-  #
-  #      if cranko show if-released --exit-code pypa:pywwt ; then
-  #        cranko zenodo upload-artifacts --metadata=ci/zenodo.json5 $BASH_WORKSPACE/sdist/*.tar.gz
-  #      fi
-  #    displayName: Upload source tarball
-  #    env:
-  #      ZENODO_TOKEN: $(ZENODO_TOKEN)
-  #
-  #  - bash: |
-  #      set -xeuo pipefail
-  #
-  #      if cranko show if-released --exit-code pypa:pywwt ; then
-  #        cranko zenodo publish --metadata=ci/zenodo.json5
-  #      fi
-  #    displayName: Publish to Zenodo
-  #    env:
-  #      ZENODO_TOKEN: $(ZENODO_TOKEN)
+  - job: zenodo_publish
+    pool:
+      vmImage: ubuntu-latest
+    variables:
+    - group: Deployment Credentials
+
+    steps:
+    - template: azure-job-setup.yml
+      parameters:
+        setupCranko: true
+
+    - bash: |
+        set -xeuo pipefail
+
+        if cranko show if-released --exit-code pypa:pywwt ; then
+          cranko zenodo upload-artifacts --metadata=ci/zenodo.json5 $BASH_WORKSPACE/sdist/*.tar.gz
+        fi
+      displayName: Upload source tarball
+      env:
+        ZENODO_TOKEN: $(ZENODO_TOKEN)
+
+    - bash: |
+        set -xeuo pipefail
+
+        if cranko show if-released --exit-code pypa:pywwt ; then
+          cranko zenodo publish --metadata=ci/zenodo.json5
+        fi
+      displayName: Publish to Zenodo
+      env:
+        ZENODO_TOKEN: $(ZENODO_TOKEN)
diff --git a/ci/azure-sdist.yml b/ci/azure-sdist.yml
@@ -29,14 +29,12 @@ jobs:
   - bash: cranko release-workflow apply-versions
     displayName: Apply Cranko versions
 
-  # 2023 Nov: temporarily disabling Zenodo; they have just updated their API and broken
-  # everything, and we want to ge a release out.
-  # - bash: |
-  #     cranko zenodo preregister --metadata=ci/zenodo.json5 pypa:pywwt pywwt/_version.py CHANGELOG.md
-  #   displayName: "Preregister Zenodo DOI"
-  #   ${{ if and(eq(variables['Build.SourceBranchName'], 'rc'), ne(variables['build.reason'], 'PullRequest')) }}:
-  #     env:
-  #         ZENODO_TOKEN: $(ZENODO_TOKEN)
+  - bash: |
+      cranko zenodo preregister --metadata=ci/zenodo.json5 pypa:pywwt pywwt/_version.py CHANGELOG.md
+    displayName: "Preregister Zenodo DOI"
+    ${{ if and(eq(variables['Build.SourceBranchName'], 'rc'), ne(variables['build.reason'], 'PullRequest')) }}:
+      env:
+          ZENODO_TOKEN: $(ZENODO_TOKEN)
 
   - bash: |
       set -xeuo pipefail