Fixes #1737: Fix broken URL for releasing uploaded artefacts to Maven… (

#1738) * Fixes #1737: Fix broken URL for releasing uploaded artefacts to Maven Central. Additionally, skip opening and closing staging repositories if there are no artefacts to be uploaded.
digital-asset · Jun 18, 2019 · 4db34f0 · 4db34f0
1 parent d88b8b4
commit 4db34f0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/docs/source/app-dev/bindings-java/index.rst b/docs/source/app-dev/bindings-java/index.rst
@@ -158,7 +158,7 @@ Replace ``x.y.z`` for both dependencies with the version that you want to use. Y
 the `Maven Central Repository <https://search.maven.org/search?q=g:com.daml.ledger>`__.
 
 .. note::
-   As of DAML SDK release 0.13.2, the Java Bindings libraries are available via the public Maven Central repository. Earlier releases are available from the `DAML Bintray repository <https://digitalassetsdk.bintray.com>`__.
+   As of DAML SDK release 0.13.3, the Java Bindings libraries are available via the public Maven Central repository. Earlier releases are available from the `DAML Bintray repository <https://digitalassetsdk.bintray.com>`__.
 
 You can also take a look at the ``pom.xml`` file from the :ref:`quickstart project <quickstart>`.
 

diff --git a/docs/source/support/release-notes.rst b/docs/source/support/release-notes.rst
@@ -9,6 +9,18 @@ This page contains release notes for the SDK.
 HEAD — ongoing
 --------------
 
+Release Procedure
+~~~~~~~~~~~~~~~~~
+
+- Fixes to the release procedure.
+  See `#1737 <https://github.com/digital-asset/daml/issues/1737>`__
+
+Java Bindings
+~~~~~~~~~~~~~
+
+- The changes for Java Bindings listed for SDK 0.13.2 now only apply to SDK 0.13.3 and later.
+  This is due to the partial failure of the release procedure.
+
 Docs
 ~~~~
 

diff --git a/release/src/Main.hs b/release/src/Main.hs
@@ -61,7 +61,11 @@ main = do
 
               let mavenUploadArtifacts = filter (\a -> getMavenUpload $ artMavenUpload a) artifacts
               uploadArtifacts <- concatMapM (artifactCoords optsAllArtifacts) mavenUploadArtifacts
-              uploadToMavenCentral mavenUploadConfig releaseDir uploadArtifacts
+              if not (null uploadArtifacts)
+                  then
+                    uploadToMavenCentral mavenUploadConfig releaseDir uploadArtifacts
+                  else
+                    $logInfo "No artifacts to upload to Maven Central"
 
               -- set variables for next steps in Azure pipelines
               liftIO . putStrLn $ "##vso[task.setvariable variable=has_released;isOutput=true]true"

diff --git a/release/src/Upload.hs b/release/src/Upload.hs
@@ -232,7 +232,7 @@ publishStagingRepo baseRequest manager comDamlRepoId comDigitalassetRepoId = do
     --
     let releaseStagingReposRequest
          = setRequestMethod "POST"
-         $ setRequestPath  "/staging/bulk/promote"
+         $ setRequestPath  "/local/staging/bulk/promote"
          $ setRequestHeader "content-type" [ "application/json" ]
          $ setRequestBodyLBS (textToLazyByteString $ "{\"data\":{\"stagedRepositoryIds\":[\"" <> comDamlRepoId <> "\",\"" <> comDigitalassetRepoId <> "\",\"description\":\"\",\"autoDropAfterRelease\":true}}") baseRequest