Update build-and-upload.yml for Azure Pipelines

microsoft · Jun 30, 2024 · 5ce875b · 5ce875b
1 parent a39ffaa
commit 5ce875b
Showing 1 changed file with 8 additions and 37 deletions.
diff --git a/.azure-pipelines/build-and-upload.yml b/.azure-pipelines/build-and-upload.yml
@@ -45,6 +45,13 @@ extends:
                 inputs:
                   targetType: inline
                   script: |
+                    # Validate storage path
+                    AzTargetPath=$(TARGET_PATH)
+                    if [[ ! "$AzTargetPath" =~ "/java/" ]]; then
+                        echo "Invalid path, please follow pattern {product}/java/{version}"
+                        exit -1
+                    fi
+
                     # Install Maven
                     mvn install -DskipTests -Dcheckstyle.skip=true -Drelease -Dmaven.repo.local=./.repository
 
@@ -138,45 +145,9 @@ extends:
                   azurePowerShellVersion: LatestVersion
                   pwsh: true
                   Inline: |
-                    # Validate storage path
-                    AzTargetPath=$(TARGET_PATH)
-                    if [[ ! "$AzTargetPath" =~ "/java/" ]]; then
-                        echo "Invalid path, please follow pattern {product}/java/{version}"
-                        exit -1
-                    fi
-                    TARGET_URL="https://azuresdkpartnerdrops.blob.core.windows.net/drops/$AzTargetPath/"
+                    $TARGET_URL="https://azuresdkpartnerdrops.blob.core.windows.net/drops/$(TARGET_PATH)/"
                     azcopy remove "$TARGET_URL"
                     azcopy copy ".release/*" "$TARGET_URL"
                     echo "Resources uploaded."
                 env:
                   AZCOPY_AUTO_LOGIN_TYPE: 'PSCRED'
-
-              - task: Bash@3
-                displayName: Upload to Azure Storage
-                inputs:
-                  targetType: inline
-                  script: |
-                    # Validate storage path
-                    AzTargetPath=$(TARGET_PATH)
-                    if [[ ! "$AzTargetPath" =~ "/java/" ]]; then
-                        echo "Invalid path, please follow pattern {product}/java/{version}"
-                        exit -1
-                    fi
-
-                    # Download AzCopy
-                    echo "downloading azcopy..."
-                    curl -L https://aka.ms/downloadazcopy-v10-windows -o azcopy.zip
-                    unzip ./azcopy.zip -d ./.azcopy_folder
-                    cp ./.azcopy_folder/*/azcopy.exe .
-
-                    export AZCOPY_SPA_CLIENT_SECRET=$(AZCOPY_SPA_CLIENT_SECRET)
-                    TARGET_URL="https://azuresdkpartnerdrops.blob.core.windows.net/drops/$AzTargetPath/"
-
-                    echo "Uploading resources to $TARGET_URL ..."
-                    ./azcopy login --service-principal --application-id cfb5fe52-8bb2-4901-9056-70449fa2df96 --tenant-id 72f988bf-86f1-41af-91ab-2d7cd011db47
-                    ./azcopy remove "$TARGET_URL"
-                    ./azcopy copy ".release/*" "$TARGET_URL"
-
-                    echo "Resources uploaded."
-                  failOnStderr: true
-                continueOnError: true