From 404957ff213570853aa70daaf0e804b699211059 Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Wed, 4 Aug 2021 05:04:05 -0700 Subject: [PATCH 01/28] added the maven preview and release stages to buildAndPackage.yml as well as github release stage. --- .azure-pipelines/buildAndPackage.yml | 38 +++++++++++++++---- .../{ => build-stage}/build-and-coverage.yml | 0 .../checkout-and-credscan.yml | 0 .../{ => build-stage}/install-java.yml | 0 .../{ => build-stage}/publish-artefacts.yml | 0 .../{ => build-stage}/secure-files.yml | 0 .../version-and-release.yml | 19 ++++++++++ .../maven-preview-stage/copy-and-build.yml | 18 +++++++++ .../maven-preview-stage/secure-files.yml | 5 +++ .../maven-release-stage/copy-and-build.yml | 18 +++++++++ .../maven-release-stage/secure-files.yml | 16 ++++++++ 11 files changed, 107 insertions(+), 7 deletions(-) rename .azure-pipelines/templates/{ => build-stage}/build-and-coverage.yml (100%) rename .azure-pipelines/templates/{ => build-stage}/checkout-and-credscan.yml (100%) rename .azure-pipelines/templates/{ => build-stage}/install-java.yml (100%) rename .azure-pipelines/templates/{ => build-stage}/publish-artefacts.yml (100%) rename .azure-pipelines/templates/{ => build-stage}/secure-files.yml (100%) create mode 100644 .azure-pipelines/templates/github-release-stage/version-and-release.yml create mode 100644 .azure-pipelines/templates/maven-preview-stage/copy-and-build.yml create mode 100644 .azure-pipelines/templates/maven-preview-stage/secure-files.yml create mode 100644 .azure-pipelines/templates/maven-release-stage/copy-and-build.yml create mode 100644 .azure-pipelines/templates/maven-release-stage/secure-files.yml diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index 27f064a80..945900031 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -30,10 +30,34 @@ pr: none pool: vmImage: windows-latest -steps: -- template: templates/checkout-and-credscan.yml -- template: templates/install-java.yml -- template: templates/secure-files.yml -- template: templates/build-and-coverage.yml -- template: templates/publish-artefacts.yml -- template: templates/alert-failure.yml +stages: +- stage: Build-Stage + jobs: + - job: Build + steps: + - template: templates/build-stage/checkout-and-credscan.yml + - template: templates/build-stage/install-java.yml + - template: templates/build-stage/secure-files.yml + - template: templates/build-stage/build-and-coverage.yml + - template: templates/build-stage/publish-artefacts.yml + - template: templates/alert-failure.yml +- stage: Maven-Preview-Stage + jobs: + - job: Maven-Preview + steps: + - template: templates/maven-preview-stage/secure-files.yml + - template: templates/maven-preview-stage/copy-and-build.yml + - template: templates/alert-failure.yml +- stage: Maven-Release-Stage + jobs: + - job: Maven-Release + steps: + - template: templates/maven-release-stage/secure-files.yml + - template: templates/maven-release-stage/copy-and-build.yml + - template: templates/alert-failure.yml +- stage: Github-Release-Stage + jobs: + - job: Github-Release + steps: + - template: templates/github-release-stage/version-and-release.yml + - template: templates/alert-failure.yml \ No newline at end of file diff --git a/.azure-pipelines/templates/build-and-coverage.yml b/.azure-pipelines/templates/build-stage/build-and-coverage.yml similarity index 100% rename from .azure-pipelines/templates/build-and-coverage.yml rename to .azure-pipelines/templates/build-stage/build-and-coverage.yml diff --git a/.azure-pipelines/templates/checkout-and-credscan.yml b/.azure-pipelines/templates/build-stage/checkout-and-credscan.yml similarity index 100% rename from .azure-pipelines/templates/checkout-and-credscan.yml rename to .azure-pipelines/templates/build-stage/checkout-and-credscan.yml diff --git a/.azure-pipelines/templates/install-java.yml b/.azure-pipelines/templates/build-stage/install-java.yml similarity index 100% rename from .azure-pipelines/templates/install-java.yml rename to .azure-pipelines/templates/build-stage/install-java.yml diff --git a/.azure-pipelines/templates/publish-artefacts.yml b/.azure-pipelines/templates/build-stage/publish-artefacts.yml similarity index 100% rename from .azure-pipelines/templates/publish-artefacts.yml rename to .azure-pipelines/templates/build-stage/publish-artefacts.yml diff --git a/.azure-pipelines/templates/secure-files.yml b/.azure-pipelines/templates/build-stage/secure-files.yml similarity index 100% rename from .azure-pipelines/templates/secure-files.yml rename to .azure-pipelines/templates/build-stage/secure-files.yml diff --git a/.azure-pipelines/templates/github-release-stage/version-and-release.yml b/.azure-pipelines/templates/github-release-stage/version-and-release.yml new file mode 100644 index 000000000..c32854420 --- /dev/null +++ b/.azure-pipelines/templates/github-release-stage/version-and-release.yml @@ -0,0 +1,19 @@ +steps: +- task: PowerShell@2 + inputs: + filePath: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop/Scripts/getLatestVersion.ps1' + arguments: '-propertiesPath "$(PROPERTIES_PATH)"' + +- task: GitHubRelease@1 + inputs: + gitHubConnection: 'ramsessanchez' + repositoryName: '$(Build.Repository.Name)' + action: 'create' + target: '$(Build.SourceVersion)' + tagSource: 'userSpecifiedTag' + tag: '$(VERSION_STRING)' + assets: | + !**/** + $(Build.ArtifactStagingDirectory)/* + changeLogCompareToRelease: 'lastFullRelease' + changeLogType: 'commitBased' \ No newline at end of file diff --git a/.azure-pipelines/templates/maven-preview-stage/copy-and-build.yml b/.azure-pipelines/templates/maven-preview-stage/copy-and-build.yml new file mode 100644 index 000000000..29e5963a5 --- /dev/null +++ b/.azure-pipelines/templates/maven-preview-stage/copy-and-build.yml @@ -0,0 +1,18 @@ +steps: +- task: CopyFiles@2 + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: '**' + TargetFolder: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop/' + +- task: Gradle@2 + inputs: + gradleWrapperFile: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop/gradlew' + workingDirectory: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop' + options: '-x jar -x javadoc -x javadocJar -x compileJava -x processResources -x classes -x sourceJar' + tasks: 'publishSnapshotPublicationToSonatypeSnapshotRepository' + publishJUnitResults: true + testResultsFiles: '**/TEST-*.xml' + javaHomeOption: 'JDKVersion' + sonarQubeRunAnalysis: false + spotBugsAnalysis: false diff --git a/.azure-pipelines/templates/maven-preview-stage/secure-files.yml b/.azure-pipelines/templates/maven-preview-stage/secure-files.yml new file mode 100644 index 000000000..a95baab5c --- /dev/null +++ b/.azure-pipelines/templates/maven-preview-stage/secure-files.yml @@ -0,0 +1,5 @@ +steps: +- task: DownloadSecureFile@1 + inputs: + secureFile: 'local.properties' + retryCount: '5' diff --git a/.azure-pipelines/templates/maven-release-stage/copy-and-build.yml b/.azure-pipelines/templates/maven-release-stage/copy-and-build.yml new file mode 100644 index 000000000..87d8bc84e --- /dev/null +++ b/.azure-pipelines/templates/maven-release-stage/copy-and-build.yml @@ -0,0 +1,18 @@ +steps: +- task: CopyFiles@2 + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: '**' + TargetFolder: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop' + +- task: Gradle@2 + inputs: + gradleWrapperFile: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop/gradlew' + workingDirectory: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop' + options: '-x jar -x javadoc -x javadocJar -x compileJava -x processResources -x classes -x sourceJar' + tasks: 'publishMavenCentralReleasePublicationToSonatypeRepository' + publishJUnitResults: true + testResultsFiles: '**/TEST-*.xml' + javaHomeOption: 'JDKVersion' + sonarQubeRunAnalysis: false + spotBugsAnalysis: false \ No newline at end of file diff --git a/.azure-pipelines/templates/maven-release-stage/secure-files.yml b/.azure-pipelines/templates/maven-release-stage/secure-files.yml new file mode 100644 index 000000000..d4bd2f6b1 --- /dev/null +++ b/.azure-pipelines/templates/maven-release-stage/secure-files.yml @@ -0,0 +1,16 @@ +steps: +- task: DownloadSecureFile@1 + inputs: + secureFile: 'local.properties' + retryCount: '5' + +- task: DownloadSecureFile@1 + inputs: + secureFile: 'secring.gpg' + retryCount: '5' + +- task: DownloadSecureFile@1 + inputs: + secureFile: 'secring.gpg.lock' + retryCount: '5' + From e95e45b6da6117257bbb0506952da51f657d43d3 Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Wed, 4 Aug 2021 05:19:55 -0700 Subject: [PATCH 02/28] add stage dependencies to release stages --- .azure-pipelines/buildAndPackage.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index 945900031..0a3c881d4 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -49,6 +49,7 @@ stages: - template: templates/maven-preview-stage/copy-and-build.yml - template: templates/alert-failure.yml - stage: Maven-Release-Stage + dependsOn: [] jobs: - job: Maven-Release steps: @@ -56,6 +57,8 @@ stages: - template: templates/maven-release-stage/copy-and-build.yml - template: templates/alert-failure.yml - stage: Github-Release-Stage + dependsOn: + - Maven-Release-Stage jobs: - job: Github-Release steps: From 517a7b85d1fd571dc608bdc18202fbe4ea7ac5b0 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 4 Aug 2021 05:37:58 -0700 Subject: [PATCH 03/28] Remove 'stage' suffix from Stage names. --- .azure-pipelines/buildAndPackage.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index 0a3c881d4..be50ce7cb 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -41,14 +41,14 @@ stages: - template: templates/build-stage/build-and-coverage.yml - template: templates/build-stage/publish-artefacts.yml - template: templates/alert-failure.yml -- stage: Maven-Preview-Stage +- stage: Maven-Preview jobs: - job: Maven-Preview steps: - template: templates/maven-preview-stage/secure-files.yml - template: templates/maven-preview-stage/copy-and-build.yml - template: templates/alert-failure.yml -- stage: Maven-Release-Stage +- stage: Maven-Release dependsOn: [] jobs: - job: Maven-Release @@ -56,11 +56,11 @@ stages: - template: templates/maven-release-stage/secure-files.yml - template: templates/maven-release-stage/copy-and-build.yml - template: templates/alert-failure.yml -- stage: Github-Release-Stage +- stage: Github-Release dependsOn: - - Maven-Release-Stage + - Maven-Release jobs: - job: Github-Release steps: - template: templates/github-release-stage/version-and-release.yml - - template: templates/alert-failure.yml \ No newline at end of file + - template: templates/alert-failure.yml From 76f61dc9ba9eda438cb6ab92a8ec35f4758db480 Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Wed, 4 Aug 2021 14:27:59 -0700 Subject: [PATCH 04/28] add conditions to the maven release stage --- .azure-pipelines/buildAndPackage.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index be50ce7cb..a44bc3688 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -41,21 +41,26 @@ stages: - template: templates/build-stage/build-and-coverage.yml - template: templates/build-stage/publish-artefacts.yml - template: templates/alert-failure.yml + - stage: Maven-Preview + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/dev')) jobs: - job: Maven-Preview steps: - template: templates/maven-preview-stage/secure-files.yml - template: templates/maven-preview-stage/copy-and-build.yml - template: templates/alert-failure.yml + - stage: Maven-Release dependsOn: [] + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) jobs: - job: Maven-Release steps: - template: templates/maven-release-stage/secure-files.yml - template: templates/maven-release-stage/copy-and-build.yml - template: templates/alert-failure.yml + - stage: Github-Release dependsOn: - Maven-Release @@ -63,4 +68,4 @@ stages: - job: Github-Release steps: - template: templates/github-release-stage/version-and-release.yml - - template: templates/alert-failure.yml + - template: templates/alert-failure.yml \ No newline at end of file From 269c8300bd1882a98516a51ee4f3dbb6b70baa9d Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Wed, 4 Aug 2021 14:41:23 -0700 Subject: [PATCH 05/28] instances of /_msgraph-sdk-java-core build and package/drop changed to DROP_PATH variable --- .../templates/github-release-stage/version-and-release.yml | 2 +- .../templates/maven-preview-stage/copy-and-build.yml | 6 +++--- .../templates/maven-release-stage/copy-and-build.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/templates/github-release-stage/version-and-release.yml b/.azure-pipelines/templates/github-release-stage/version-and-release.yml index c32854420..f901df8d9 100644 --- a/.azure-pipelines/templates/github-release-stage/version-and-release.yml +++ b/.azure-pipelines/templates/github-release-stage/version-and-release.yml @@ -1,7 +1,7 @@ steps: - task: PowerShell@2 inputs: - filePath: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop/Scripts/getLatestVersion.ps1' + filePath: '$(DROP_PATH)/Scripts/getLatestVersion.ps1' arguments: '-propertiesPath "$(PROPERTIES_PATH)"' - task: GitHubRelease@1 diff --git a/.azure-pipelines/templates/maven-preview-stage/copy-and-build.yml b/.azure-pipelines/templates/maven-preview-stage/copy-and-build.yml index 29e5963a5..4354b0c4a 100644 --- a/.azure-pipelines/templates/maven-preview-stage/copy-and-build.yml +++ b/.azure-pipelines/templates/maven-preview-stage/copy-and-build.yml @@ -3,12 +3,12 @@ steps: inputs: SourceFolder: '$(Agent.TempDirectory)' Contents: '**' - TargetFolder: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop/' + TargetFolder: '$(DROP_PATH)/' - task: Gradle@2 inputs: - gradleWrapperFile: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop/gradlew' - workingDirectory: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop' + gradleWrapperFile: '$(DROP_PATH)/gradlew' + workingDirectory: '$(DROP_PATH)' options: '-x jar -x javadoc -x javadocJar -x compileJava -x processResources -x classes -x sourceJar' tasks: 'publishSnapshotPublicationToSonatypeSnapshotRepository' publishJUnitResults: true diff --git a/.azure-pipelines/templates/maven-release-stage/copy-and-build.yml b/.azure-pipelines/templates/maven-release-stage/copy-and-build.yml index 87d8bc84e..69c48e0dc 100644 --- a/.azure-pipelines/templates/maven-release-stage/copy-and-build.yml +++ b/.azure-pipelines/templates/maven-release-stage/copy-and-build.yml @@ -3,12 +3,12 @@ steps: inputs: SourceFolder: '$(Agent.TempDirectory)' Contents: '**' - TargetFolder: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop' + TargetFolder: '$(DROP_PATH)' - task: Gradle@2 inputs: - gradleWrapperFile: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop/gradlew' - workingDirectory: '$(System.DefaultWorkingDirectory)/_msgraph-sdk-java-core build and package/drop' + gradleWrapperFile: '$(DROP_PATH)/gradlew' + workingDirectory: '$(DROP_PATH)' options: '-x jar -x javadoc -x javadocJar -x compileJava -x processResources -x classes -x sourceJar' tasks: 'publishMavenCentralReleasePublicationToSonatypeRepository' publishJUnitResults: true From ad182d5ec480977064d6088169ce7ab57b811cee Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Thu, 5 Aug 2021 13:00:52 -0700 Subject: [PATCH 06/28] added download-artifacts template, modified publish artifacts, both now publish/download pipeline-artifacts --- .azure-pipelines/buildAndPackage.yml | 3 +++ .../templates/build-stage/publish-artefacts.yml | 7 ++++--- .azure-pipelines/templates/download-artifacts.yml | 6 ++++++ 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 .azure-pipelines/templates/download-artifacts.yml diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index a44bc3688..e2fdd32fd 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -47,6 +47,7 @@ stages: jobs: - job: Maven-Preview steps: + - template: templates/download-artifacts.yml - template: templates/maven-preview-stage/secure-files.yml - template: templates/maven-preview-stage/copy-and-build.yml - template: templates/alert-failure.yml @@ -57,6 +58,7 @@ stages: jobs: - job: Maven-Release steps: + - template: templates/download-artifacts.yml - template: templates/maven-release-stage/secure-files.yml - template: templates/maven-release-stage/copy-and-build.yml - template: templates/alert-failure.yml @@ -67,5 +69,6 @@ stages: jobs: - job: Github-Release steps: + - template: templates/download-artifacts.yml - template: templates/github-release-stage/version-and-release.yml - template: templates/alert-failure.yml \ No newline at end of file diff --git a/.azure-pipelines/templates/build-stage/publish-artefacts.yml b/.azure-pipelines/templates/build-stage/publish-artefacts.yml index 5715208b2..6aef16de5 100644 --- a/.azure-pipelines/templates/build-stage/publish-artefacts.yml +++ b/.azure-pipelines/templates/build-stage/publish-artefacts.yml @@ -15,7 +15,8 @@ steps: Scripts/** TargetFolder: '$(Build.ArtifactStagingDirectory)/' -- task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: drop' +- task: PublishPipelineArtifact@1 inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)' \ No newline at end of file + targetPath: '$(Build.ArtifactStagingDirectory)' + artifact: 'Drop' + publishLocation: 'pipeline' \ No newline at end of file diff --git a/.azure-pipelines/templates/download-artifacts.yml b/.azure-pipelines/templates/download-artifacts.yml new file mode 100644 index 000000000..3f10b938f --- /dev/null +++ b/.azure-pipelines/templates/download-artifacts.yml @@ -0,0 +1,6 @@ +steps: +- task: DownloadPipelineArtifact@2 + inputs: + buildType: 'current' + artifactName: 'Drop' + targetPath: '$(Pipeline.Workspace)' \ No newline at end of file From a2b6f324cce3299f9f600118651493f7bc19bec5 Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Thu, 5 Aug 2021 13:47:20 -0700 Subject: [PATCH 07/28] added validation request for release stage --- .azure-pipelines/buildAndPackage.yml | 1 + .azure-pipelines/templates/validation-request.yml | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 .azure-pipelines/templates/validation-request.yml diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index e2fdd32fd..efd7a8df3 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -58,6 +58,7 @@ stages: jobs: - job: Maven-Release steps: + - template: templates/validation-request.yml - template: templates/download-artifacts.yml - template: templates/maven-release-stage/secure-files.yml - template: templates/maven-release-stage/copy-and-build.yml diff --git a/.azure-pipelines/templates/validation-request.yml b/.azure-pipelines/templates/validation-request.yml new file mode 100644 index 000000000..03681ae11 --- /dev/null +++ b/.azure-pipelines/templates/validation-request.yml @@ -0,0 +1,10 @@ +steps: +- task: ManualValidation@0 + inputs: + notifyUsers: | + mmainer@microsoft.com + vibiret@microsoft.com + ramsess@microsoft.com + instructions: | + By validating you agree to continue the Maven Release stage of the + microsoftgraph.msgraph-sdk-java-core pipeline. \ No newline at end of file From 4fe5d40f89d9c2ae790071e92593178a3a784478 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Fri, 6 Aug 2021 10:12:21 -0700 Subject: [PATCH 08/28] Update buildAndPackage.yml --- .azure-pipelines/buildAndPackage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index efd7a8df3..c1d6b5103 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -31,7 +31,7 @@ pool: vmImage: windows-latest stages: -- stage: Build-Stage +- stage: Build jobs: - job: Build steps: @@ -72,4 +72,4 @@ stages: steps: - template: templates/download-artifacts.yml - template: templates/github-release-stage/version-and-release.yml - - template: templates/alert-failure.yml \ No newline at end of file + - template: templates/alert-failure.yml From d46525bdc9972d41d34ce8dc9772ff8bbd2fa57b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Aug 2021 08:02:32 +0000 Subject: [PATCH 09/28] Bump azure-core from 1.18.0 to 1.19.0 Bumps [azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.18.0 to 1.19.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-core_1.18.0...azure-core_1.19.0) --- updated-dependencies: - dependency-name: com.azure:azure-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 38372fff6..87a956450 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -9,5 +9,5 @@ dependencies { implementation 'com.google.guava:guava:30.1.1-jre' implementation 'com.google.code.gson:gson:2.8.7' - api 'com.azure:azure-core:1.18.0' + api 'com.azure:azure-core:1.19.0' } \ No newline at end of file From ed992562f1f386fe3afbcf404ea5b945809dfda9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Aug 2021 08:16:19 +0000 Subject: [PATCH 10/28] Bump azure-core from 1.18.0 to 1.19.0 Bumps [azure-core](https://github.com/Azure/azure-sdk-for-java) from 1.18.0 to 1.19.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-core_1.18.0...azure-core_1.19.0) --- updated-dependencies: - dependency-name: com.azure:azure-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2367f3c17..3823f7259 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ com.azure azure-core - 1.18.0 + 1.19.0 org.junit.jupiter From 8974990b3377fe1b73c179f6bd5ad3717549450b Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Tue, 10 Aug 2021 14:27:14 -0700 Subject: [PATCH 11/28] Update buildAndPackage.yml for Azure Pipelines --- .azure-pipelines/buildAndPackage.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index c1d6b5103..8f5dfe121 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -56,13 +56,19 @@ stages: dependsOn: [] condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) jobs: - - job: Maven-Release - steps: - - template: templates/validation-request.yml - - template: templates/download-artifacts.yml - - template: templates/maven-release-stage/secure-files.yml - - template: templates/maven-release-stage/copy-and-build.yml - - template: templates/alert-failure.yml + - deployment: Maven-Release + environment: 'MSGraph SDK Development - Java' + pool: + vmImage: windows-latest + strategy: + runOnce: + deploy: + steps: + - template: templates/validation-request.yml + - template: templates/download-artifacts.yml + - template: templates/maven-release-stage/secure-files.yml + - template: templates/maven-release-stage/copy-and-build.yml + - template: templates/alert-failure.yml - stage: Github-Release dependsOn: From 425987fe01adf8e7670b8258626e71a6191e8a2f Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Tue, 10 Aug 2021 14:29:03 -0700 Subject: [PATCH 12/28] using 'publish' keyword to implicitly call publishPipelineArtifact task --- .../templates/build-stage/publish-artefacts.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/templates/build-stage/publish-artefacts.yml b/.azure-pipelines/templates/build-stage/publish-artefacts.yml index 6aef16de5..fc7f7a4c3 100644 --- a/.azure-pipelines/templates/build-stage/publish-artefacts.yml +++ b/.azure-pipelines/templates/build-stage/publish-artefacts.yml @@ -15,8 +15,6 @@ steps: Scripts/** TargetFolder: '$(Build.ArtifactStagingDirectory)/' -- task: PublishPipelineArtifact@1 - inputs: - targetPath: '$(Build.ArtifactStagingDirectory)' - artifact: 'Drop' - publishLocation: 'pipeline' \ No newline at end of file +- publish: $(Build.ArtifactStagingDirectory) + artifact: Drop + displayName: Publish Build Artifact From 543f75cb4b1b6ba116da59118875ef772fd19405 Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Tue, 10 Aug 2021 14:44:37 -0700 Subject: [PATCH 13/28] removed implicit streps included in deployment-job --- .azure-pipelines/buildAndPackage.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index 8f5dfe121..2cbb80b3d 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -64,8 +64,6 @@ stages: runOnce: deploy: steps: - - template: templates/validation-request.yml - - template: templates/download-artifacts.yml - template: templates/maven-release-stage/secure-files.yml - template: templates/maven-release-stage/copy-and-build.yml - template: templates/alert-failure.yml From 1705e2ca019e6edb6b3611a0eb615ba893dd2171 Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Tue, 10 Aug 2021 15:07:44 -0700 Subject: [PATCH 14/28] propose to put maven and github release into a single stage --- .azure-pipelines/buildAndPackage.yml | 32 +++++++++++++++++++--------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index 2cbb80b3d..1c5da304f 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -52,7 +52,7 @@ stages: - template: templates/maven-preview-stage/copy-and-build.yml - template: templates/alert-failure.yml -- stage: Maven-Release +- stage: Maven-Release-And-Git-Release dependsOn: [] condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) jobs: @@ -68,12 +68,24 @@ stages: - template: templates/maven-release-stage/copy-and-build.yml - template: templates/alert-failure.yml -- stage: Github-Release - dependsOn: - - Maven-Release - jobs: - - job: Github-Release - steps: - - template: templates/download-artifacts.yml - - template: templates/github-release-stage/version-and-release.yml - - template: templates/alert-failure.yml + - deployment: Github-Release + dependsOn: Maven-Release + environment: 'MSGraph SDK Development - Java' + pool: + vmImage: windows-latest + strategy: + runOnce: + deploy: + steps: + - template: templates/github-release-stage/version-and-release.yml + - template: templates/alert-failure.yml + +#- stage: Github-Release +# dependsOn: +# - Maven-Release +# jobs: +# - job: Github-Release +# steps: +# - template: templates/download-artifacts.yml +# - template: templates/github-release-stage/version-and-release.yml +# - template: templates/alert-failure.yml From 3b2d3680d0bd1b145546c398f1f2e06ad2634e01 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Thu, 12 Aug 2021 13:08:12 -0700 Subject: [PATCH 15/28] Update buildAndPackage.yml spacing issue --- .azure-pipelines/buildAndPackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index 1c5da304f..4bb988036 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -76,7 +76,7 @@ stages: strategy: runOnce: deploy: - steps: + steps: - template: templates/github-release-stage/version-and-release.yml - template: templates/alert-failure.yml From 260fe8cebca03deedd0d473c930de6f464c82ea8 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Thu, 12 Aug 2021 16:01:27 -0700 Subject: [PATCH 16/28] Update buildAndPackage.yml for Azure Pipelines --- .azure-pipelines/buildAndPackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index 4bb988036..9477eaf6d 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -52,7 +52,7 @@ stages: - template: templates/maven-preview-stage/copy-and-build.yml - template: templates/alert-failure.yml -- stage: Maven-Release-And-Git-Release +- stage: Maven-Release-And-Github-Release dependsOn: [] condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) jobs: From fcbfa0c1b464d5a7c91fd1dc368477c69588a83e Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Fri, 13 Aug 2021 11:02:35 -0700 Subject: [PATCH 17/28] Update buildAndPackage.yml --- .azure-pipelines/buildAndPackage.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index 9477eaf6d..ba3e0984e 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -79,13 +79,3 @@ stages: steps: - template: templates/github-release-stage/version-and-release.yml - template: templates/alert-failure.yml - -#- stage: Github-Release -# dependsOn: -# - Maven-Release -# jobs: -# - job: Github-Release -# steps: -# - template: templates/download-artifacts.yml -# - template: templates/github-release-stage/version-and-release.yml -# - template: templates/alert-failure.yml From 2277888fcebaab9f5c78e67357f274ba958a560f Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Fri, 13 Aug 2021 11:09:43 -0700 Subject: [PATCH 18/28] removed 'stage' suffix from folder names --- .../{build-stage => build}/build-and-coverage.yml | 0 .../{build-stage => build}/checkout-and-credscan.yml | 0 .../templates/{build-stage => build}/install-java.yml | 0 .../{build-stage => build}/publish-artefacts.yml | 0 .../templates/{build-stage => build}/secure-files.yml | 0 .../version-and-release.yml | 0 .../copy-and-build.yml | 0 .../secure-files.yml | 0 .../copy-and-build.yml | 0 .../secure-files.yml | 0 .azure-pipelines/templates/validation-request.yml | 10 ---------- 11 files changed, 10 deletions(-) rename .azure-pipelines/templates/{build-stage => build}/build-and-coverage.yml (100%) rename .azure-pipelines/templates/{build-stage => build}/checkout-and-credscan.yml (100%) rename .azure-pipelines/templates/{build-stage => build}/install-java.yml (100%) rename .azure-pipelines/templates/{build-stage => build}/publish-artefacts.yml (100%) rename .azure-pipelines/templates/{build-stage => build}/secure-files.yml (100%) rename .azure-pipelines/templates/{github-release-stage => github-release}/version-and-release.yml (100%) rename .azure-pipelines/templates/{maven-preview-stage => maven-preview}/copy-and-build.yml (100%) rename .azure-pipelines/templates/{maven-preview-stage => maven-preview}/secure-files.yml (100%) rename .azure-pipelines/templates/{maven-release-stage => maven-release}/copy-and-build.yml (100%) rename .azure-pipelines/templates/{maven-release-stage => maven-release}/secure-files.yml (100%) delete mode 100644 .azure-pipelines/templates/validation-request.yml diff --git a/.azure-pipelines/templates/build-stage/build-and-coverage.yml b/.azure-pipelines/templates/build/build-and-coverage.yml similarity index 100% rename from .azure-pipelines/templates/build-stage/build-and-coverage.yml rename to .azure-pipelines/templates/build/build-and-coverage.yml diff --git a/.azure-pipelines/templates/build-stage/checkout-and-credscan.yml b/.azure-pipelines/templates/build/checkout-and-credscan.yml similarity index 100% rename from .azure-pipelines/templates/build-stage/checkout-and-credscan.yml rename to .azure-pipelines/templates/build/checkout-and-credscan.yml diff --git a/.azure-pipelines/templates/build-stage/install-java.yml b/.azure-pipelines/templates/build/install-java.yml similarity index 100% rename from .azure-pipelines/templates/build-stage/install-java.yml rename to .azure-pipelines/templates/build/install-java.yml diff --git a/.azure-pipelines/templates/build-stage/publish-artefacts.yml b/.azure-pipelines/templates/build/publish-artefacts.yml similarity index 100% rename from .azure-pipelines/templates/build-stage/publish-artefacts.yml rename to .azure-pipelines/templates/build/publish-artefacts.yml diff --git a/.azure-pipelines/templates/build-stage/secure-files.yml b/.azure-pipelines/templates/build/secure-files.yml similarity index 100% rename from .azure-pipelines/templates/build-stage/secure-files.yml rename to .azure-pipelines/templates/build/secure-files.yml diff --git a/.azure-pipelines/templates/github-release-stage/version-and-release.yml b/.azure-pipelines/templates/github-release/version-and-release.yml similarity index 100% rename from .azure-pipelines/templates/github-release-stage/version-and-release.yml rename to .azure-pipelines/templates/github-release/version-and-release.yml diff --git a/.azure-pipelines/templates/maven-preview-stage/copy-and-build.yml b/.azure-pipelines/templates/maven-preview/copy-and-build.yml similarity index 100% rename from .azure-pipelines/templates/maven-preview-stage/copy-and-build.yml rename to .azure-pipelines/templates/maven-preview/copy-and-build.yml diff --git a/.azure-pipelines/templates/maven-preview-stage/secure-files.yml b/.azure-pipelines/templates/maven-preview/secure-files.yml similarity index 100% rename from .azure-pipelines/templates/maven-preview-stage/secure-files.yml rename to .azure-pipelines/templates/maven-preview/secure-files.yml diff --git a/.azure-pipelines/templates/maven-release-stage/copy-and-build.yml b/.azure-pipelines/templates/maven-release/copy-and-build.yml similarity index 100% rename from .azure-pipelines/templates/maven-release-stage/copy-and-build.yml rename to .azure-pipelines/templates/maven-release/copy-and-build.yml diff --git a/.azure-pipelines/templates/maven-release-stage/secure-files.yml b/.azure-pipelines/templates/maven-release/secure-files.yml similarity index 100% rename from .azure-pipelines/templates/maven-release-stage/secure-files.yml rename to .azure-pipelines/templates/maven-release/secure-files.yml diff --git a/.azure-pipelines/templates/validation-request.yml b/.azure-pipelines/templates/validation-request.yml deleted file mode 100644 index 03681ae11..000000000 --- a/.azure-pipelines/templates/validation-request.yml +++ /dev/null @@ -1,10 +0,0 @@ -steps: -- task: ManualValidation@0 - inputs: - notifyUsers: | - mmainer@microsoft.com - vibiret@microsoft.com - ramsess@microsoft.com - instructions: | - By validating you agree to continue the Maven Release stage of the - microsoftgraph.msgraph-sdk-java-core pipeline. \ No newline at end of file From 1ab2c15e2de3dbfce99b090546ea9db0ddecff1e Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Fri, 13 Aug 2021 11:10:26 -0700 Subject: [PATCH 19/28] file path changes to highlight suffix removal --- .azure-pipelines/buildAndPackage.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index ba3e0984e..29bbe176f 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -35,11 +35,11 @@ stages: jobs: - job: Build steps: - - template: templates/build-stage/checkout-and-credscan.yml - - template: templates/build-stage/install-java.yml - - template: templates/build-stage/secure-files.yml - - template: templates/build-stage/build-and-coverage.yml - - template: templates/build-stage/publish-artefacts.yml + - template: templates/build/checkout-and-credscan.yml + - template: templates/build/install-java.yml + - template: templates/build/secure-files.yml + - template: templates/build/build-and-coverage.yml + - template: templates/build/publish-artefacts.yml - template: templates/alert-failure.yml - stage: Maven-Preview @@ -48,8 +48,8 @@ stages: - job: Maven-Preview steps: - template: templates/download-artifacts.yml - - template: templates/maven-preview-stage/secure-files.yml - - template: templates/maven-preview-stage/copy-and-build.yml + - template: templates/meven-preview/secure-files.yml + - template: templates/meven-preview/copy-and-build.yml - template: templates/alert-failure.yml - stage: Maven-Release-And-Github-Release @@ -64,8 +64,8 @@ stages: runOnce: deploy: steps: - - template: templates/maven-release-stage/secure-files.yml - - template: templates/maven-release-stage/copy-and-build.yml + - template: templates/meven-release/secure-files.yml + - template: templates/meven-release/copy-and-build.yml - template: templates/alert-failure.yml - deployment: Github-Release @@ -77,5 +77,5 @@ stages: runOnce: deploy: steps: - - template: templates/github-release-stage/version-and-release.yml + - template: templates/github-release/version-and-release.yml - template: templates/alert-failure.yml From 634c392481a85db927b8ac9e1dc8879f942c443b Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Fri, 13 Aug 2021 12:29:50 -0700 Subject: [PATCH 20/28] template parameters for secure-files.yml --- .azure-pipelines/buildAndPackage.yml | 10 +++++-- .../templates/build/secure-files.yml | 18 ------------ .../templates/maven-preview/secure-files.yml | 5 ---- .../templates/maven-release/secure-files.yml | 16 ---------- .azure-pipelines/templates/secure-files.yml | 29 +++++++++++++++++++ 5 files changed, 36 insertions(+), 42 deletions(-) delete mode 100644 .azure-pipelines/templates/build/secure-files.yml delete mode 100644 .azure-pipelines/templates/maven-preview/secure-files.yml delete mode 100644 .azure-pipelines/templates/maven-release/secure-files.yml create mode 100644 .azure-pipelines/templates/secure-files.yml diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index 29bbe176f..abc745de2 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -37,7 +37,9 @@ stages: steps: - template: templates/build/checkout-and-credscan.yml - template: templates/build/install-java.yml - - template: templates/build/secure-files.yml + - template: templates/secure-files.yml + parameters: + stageID: 'build' - template: templates/build/build-and-coverage.yml - template: templates/build/publish-artefacts.yml - template: templates/alert-failure.yml @@ -48,7 +50,7 @@ stages: - job: Maven-Preview steps: - template: templates/download-artifacts.yml - - template: templates/meven-preview/secure-files.yml + - template: templates/secure-files.yml - template: templates/meven-preview/copy-and-build.yml - template: templates/alert-failure.yml @@ -64,7 +66,9 @@ stages: runOnce: deploy: steps: - - template: templates/meven-release/secure-files.yml + - template: templates/secure-files.yml + parameters: + stageID: 'release' - template: templates/meven-release/copy-and-build.yml - template: templates/alert-failure.yml diff --git a/.azure-pipelines/templates/build/secure-files.yml b/.azure-pipelines/templates/build/secure-files.yml deleted file mode 100644 index 0cdeb85b9..000000000 --- a/.azure-pipelines/templates/build/secure-files.yml +++ /dev/null @@ -1,18 +0,0 @@ -steps: -- task: DownloadSecureFile@1 - inputs: - secureFile: 'local.properties' - -- task: DownloadSecureFile@1 - inputs: - secureFile: 'secring.gpg' - -- task: DownloadSecureFile@1 - inputs: - secureFile: 'secring.gpg.lock' - -- task: CopyFiles@2 - inputs: - SourceFolder: '$(Agent.TempDirectory)' - Contents: '**' - TargetFolder: '$(System.DefaultWorkingDirectory)' \ No newline at end of file diff --git a/.azure-pipelines/templates/maven-preview/secure-files.yml b/.azure-pipelines/templates/maven-preview/secure-files.yml deleted file mode 100644 index a95baab5c..000000000 --- a/.azure-pipelines/templates/maven-preview/secure-files.yml +++ /dev/null @@ -1,5 +0,0 @@ -steps: -- task: DownloadSecureFile@1 - inputs: - secureFile: 'local.properties' - retryCount: '5' diff --git a/.azure-pipelines/templates/maven-release/secure-files.yml b/.azure-pipelines/templates/maven-release/secure-files.yml deleted file mode 100644 index d4bd2f6b1..000000000 --- a/.azure-pipelines/templates/maven-release/secure-files.yml +++ /dev/null @@ -1,16 +0,0 @@ -steps: -- task: DownloadSecureFile@1 - inputs: - secureFile: 'local.properties' - retryCount: '5' - -- task: DownloadSecureFile@1 - inputs: - secureFile: 'secring.gpg' - retryCount: '5' - -- task: DownloadSecureFile@1 - inputs: - secureFile: 'secring.gpg.lock' - retryCount: '5' - diff --git a/.azure-pipelines/templates/secure-files.yml b/.azure-pipelines/templates/secure-files.yml new file mode 100644 index 000000000..d0b26a145 --- /dev/null +++ b/.azure-pipelines/templates/secure-files.yml @@ -0,0 +1,29 @@ +parameters: +- name: stageID + type: string + default: '' + +steps: +- task: DownloadSecureFile@1 + inputs: + secureFile: 'local.properties' + retryCount: '5' + +- ${{ if or(eq(parameters.stageID, 'release'), eq(parameters.stageID, 'build') }}: + - task: DownloadSecureFile@1 + inputs: + secureFile: 'secring.gpg' + retryCount: '5' + + - task: DownloadSecureFile@1 + inputs: + secureFile: 'secring.gpg.lock' + retryCount: '5' + +- ${{ if eq(parameters.stageID, 'build') }}: + - task: CopyFiles@2 + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: '**' + TargetFolder: '$(System.DefaultWorkingDirectory)' + From f9d29418920a60537fdcdd66b0f497e6ef65e434 Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Fri, 13 Aug 2021 13:01:59 -0700 Subject: [PATCH 21/28] parameter for copy-and-build, now a single file --- .azure-pipelines/buildAndPackage.yml | 8 ++++++-- .../templates/{maven-preview => }/copy-and-build.yml | 7 ++++++- .../templates/maven-release/copy-and-build.yml | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) rename .azure-pipelines/templates/{maven-preview => }/copy-and-build.yml (85%) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index abc745de2..a609019f0 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -51,7 +51,9 @@ stages: steps: - template: templates/download-artifacts.yml - template: templates/secure-files.yml - - template: templates/meven-preview/copy-and-build.yml + - template: templates/copy-and-build.yml + parameters: + task: 'publishSnapshotPublicationToSonatypeSnapshotRepository' - template: templates/alert-failure.yml - stage: Maven-Release-And-Github-Release @@ -69,7 +71,9 @@ stages: - template: templates/secure-files.yml parameters: stageID: 'release' - - template: templates/meven-release/copy-and-build.yml + - template: templates/copy-and-build.yml + parameters: + task: 'publishMavenCentralReleasePublicationToSonatypeRepository' - template: templates/alert-failure.yml - deployment: Github-Release diff --git a/.azure-pipelines/templates/maven-preview/copy-and-build.yml b/.azure-pipelines/templates/copy-and-build.yml similarity index 85% rename from .azure-pipelines/templates/maven-preview/copy-and-build.yml rename to .azure-pipelines/templates/copy-and-build.yml index 4354b0c4a..3617bfeaf 100644 --- a/.azure-pipelines/templates/maven-preview/copy-and-build.yml +++ b/.azure-pipelines/templates/copy-and-build.yml @@ -1,3 +1,8 @@ +parameters: +- name: task + type: string + default: '' + steps: - task: CopyFiles@2 inputs: @@ -10,7 +15,7 @@ steps: gradleWrapperFile: '$(DROP_PATH)/gradlew' workingDirectory: '$(DROP_PATH)' options: '-x jar -x javadoc -x javadocJar -x compileJava -x processResources -x classes -x sourceJar' - tasks: 'publishSnapshotPublicationToSonatypeSnapshotRepository' + tasks: ${{ parameters.task }} publishJUnitResults: true testResultsFiles: '**/TEST-*.xml' javaHomeOption: 'JDKVersion' diff --git a/.azure-pipelines/templates/maven-release/copy-and-build.yml b/.azure-pipelines/templates/maven-release/copy-and-build.yml index 69c48e0dc..0b24b26e1 100644 --- a/.azure-pipelines/templates/maven-release/copy-and-build.yml +++ b/.azure-pipelines/templates/maven-release/copy-and-build.yml @@ -3,7 +3,7 @@ steps: inputs: SourceFolder: '$(Agent.TempDirectory)' Contents: '**' - TargetFolder: '$(DROP_PATH)' + TargetFolder: '$(DROP_PATH)/' - task: Gradle@2 inputs: From ba66e9399ff33e9ddedda0519018f6a606c2b52a Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Fri, 13 Aug 2021 13:13:02 -0700 Subject: [PATCH 22/28] preview stage now uses a deployment job, download-artifacts.yml and copy-and-build.yml is reduced to one instance --- .azure-pipelines/buildAndPackage.yml | 21 ++++++++++++------- .../templates/download-artifacts.yml | 6 ------ .../maven-release/copy-and-build.yml | 18 ---------------- 3 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 .azure-pipelines/templates/download-artifacts.yml delete mode 100644 .azure-pipelines/templates/maven-release/copy-and-build.yml diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index a609019f0..03e2f1e33 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -47,14 +47,19 @@ stages: - stage: Maven-Preview condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/dev')) jobs: - - job: Maven-Preview - steps: - - template: templates/download-artifacts.yml - - template: templates/secure-files.yml - - template: templates/copy-and-build.yml - parameters: - task: 'publishSnapshotPublicationToSonatypeSnapshotRepository' - - template: templates/alert-failure.yml + - deployment: Maven-Preview + environment: 'MSGraph SDK Development - Java' + pool: + vmImage: windows-latest + strategy: + runOnce: + deploy: + steps: + - template: templates/secure-files.yml + - template: templates/copy-and-build.yml + parameters: + task: 'publishSnapshotPublicationToSonatypeSnapshotRepository' + - template: templates/alert-failure.yml - stage: Maven-Release-And-Github-Release dependsOn: [] diff --git a/.azure-pipelines/templates/download-artifacts.yml b/.azure-pipelines/templates/download-artifacts.yml deleted file mode 100644 index 3f10b938f..000000000 --- a/.azure-pipelines/templates/download-artifacts.yml +++ /dev/null @@ -1,6 +0,0 @@ -steps: -- task: DownloadPipelineArtifact@2 - inputs: - buildType: 'current' - artifactName: 'Drop' - targetPath: '$(Pipeline.Workspace)' \ No newline at end of file diff --git a/.azure-pipelines/templates/maven-release/copy-and-build.yml b/.azure-pipelines/templates/maven-release/copy-and-build.yml deleted file mode 100644 index 0b24b26e1..000000000 --- a/.azure-pipelines/templates/maven-release/copy-and-build.yml +++ /dev/null @@ -1,18 +0,0 @@ -steps: -- task: CopyFiles@2 - inputs: - SourceFolder: '$(Agent.TempDirectory)' - Contents: '**' - TargetFolder: '$(DROP_PATH)/' - -- task: Gradle@2 - inputs: - gradleWrapperFile: '$(DROP_PATH)/gradlew' - workingDirectory: '$(DROP_PATH)' - options: '-x jar -x javadoc -x javadocJar -x compileJava -x processResources -x classes -x sourceJar' - tasks: 'publishMavenCentralReleasePublicationToSonatypeRepository' - publishJUnitResults: true - testResultsFiles: '**/TEST-*.xml' - javaHomeOption: 'JDKVersion' - sonarQubeRunAnalysis: false - spotBugsAnalysis: false \ No newline at end of file From 6901b5cac126f76a9b31e38bf2467266916442b5 Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Fri, 13 Aug 2021 13:20:14 -0700 Subject: [PATCH 23/28] github connection now a parameter, removed git-release folder since it only contained 1 file --- .azure-pipelines/buildAndPackage.yml | 4 +++- .../templates/{github-release => }/version-and-release.yml | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) rename .azure-pipelines/templates/{github-release => }/version-and-release.yml (89%) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index 03e2f1e33..bb6fae967 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -90,5 +90,7 @@ stages: runOnce: deploy: steps: - - template: templates/github-release/version-and-release.yml + - template: templates/version-and-release.yml + parameters: + gitConnection: 'ramsessanchez' - template: templates/alert-failure.yml diff --git a/.azure-pipelines/templates/github-release/version-and-release.yml b/.azure-pipelines/templates/version-and-release.yml similarity index 89% rename from .azure-pipelines/templates/github-release/version-and-release.yml rename to .azure-pipelines/templates/version-and-release.yml index f901df8d9..0530628ae 100644 --- a/.azure-pipelines/templates/github-release/version-and-release.yml +++ b/.azure-pipelines/templates/version-and-release.yml @@ -1,3 +1,8 @@ +parameters: + name: gitConnection + type: string + default: '' + steps: - task: PowerShell@2 inputs: From 12a22f08b85dc6e128034add18dcd0fda5e696cc Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Fri, 13 Aug 2021 13:22:18 -0700 Subject: [PATCH 24/28] param update --- .azure-pipelines/templates/version-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/templates/version-and-release.yml b/.azure-pipelines/templates/version-and-release.yml index 0530628ae..bd92ef95f 100644 --- a/.azure-pipelines/templates/version-and-release.yml +++ b/.azure-pipelines/templates/version-and-release.yml @@ -11,7 +11,7 @@ steps: - task: GitHubRelease@1 inputs: - gitHubConnection: 'ramsessanchez' + gitHubConnection: ${{ parameters.gitConnection }} repositoryName: '$(Build.Repository.Name)' action: 'create' target: '$(Build.SourceVersion)' From 33a1c63f5859e4b4163ff2f2b871ebc3f6a53e6c Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Fri, 13 Aug 2021 13:31:29 -0700 Subject: [PATCH 25/28] Update version-and-release.yml --- .azure-pipelines/templates/version-and-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/templates/version-and-release.yml b/.azure-pipelines/templates/version-and-release.yml index bd92ef95f..4eed424af 100644 --- a/.azure-pipelines/templates/version-and-release.yml +++ b/.azure-pipelines/templates/version-and-release.yml @@ -1,5 +1,5 @@ parameters: - name: gitConnection +- name: gitConnection type: string default: '' @@ -21,4 +21,4 @@ steps: !**/** $(Build.ArtifactStagingDirectory)/* changeLogCompareToRelease: 'lastFullRelease' - changeLogType: 'commitBased' \ No newline at end of file + changeLogType: 'commitBased' From 21c183bb18de60ca80601e0541cd99beaf8033f6 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Fri, 13 Aug 2021 13:48:34 -0700 Subject: [PATCH 26/28] Update secure-files.yml --- .azure-pipelines/templates/secure-files.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/templates/secure-files.yml b/.azure-pipelines/templates/secure-files.yml index d0b26a145..7e5e716a5 100644 --- a/.azure-pipelines/templates/secure-files.yml +++ b/.azure-pipelines/templates/secure-files.yml @@ -9,7 +9,7 @@ steps: secureFile: 'local.properties' retryCount: '5' -- ${{ if or(eq(parameters.stageID, 'release'), eq(parameters.stageID, 'build') }}: +- ${{ if or(eq(parameters.stageID, 'build'), eq(parameters.stageID, 'release') }}: - task: DownloadSecureFile@1 inputs: secureFile: 'secring.gpg' From 12917ea7a09a289135c4707dbc92ace3642748c3 Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Mon, 16 Aug 2021 11:04:04 -0700 Subject: [PATCH 27/28] updated paths in prValidate.yml which were preventing pipeline from running --- .azure-pipelines/prValidate.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/prValidate.yml b/.azure-pipelines/prValidate.yml index 04d26ac14..7733129df 100644 --- a/.azure-pipelines/prValidate.yml +++ b/.azure-pipelines/prValidate.yml @@ -29,7 +29,7 @@ pool: vmImage: windows-latest steps: -- template: templates/checkout-and-credscan.yml -- template: templates/install-java.yml -- template: templates/build-and-coverage.yml +- template: templates/build/checkout-and-credscan.yml +- template: templates/build/install-java.yml +- template: templates/build/build-and-coverage.yml - template: templates/alert-failure.yml From e12d8530be36f5eb1f4820b7cc0ff673532c9fe8 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Mon, 16 Aug 2021 15:54:53 -0400 Subject: [PATCH 28/28] - removes obsolete PR validate pipeline --- .azure-pipelines/prValidate.yml | 35 --------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 .azure-pipelines/prValidate.yml diff --git a/.azure-pipelines/prValidate.yml b/.azure-pipelines/prValidate.yml deleted file mode 100644 index 7733129df..000000000 --- a/.azure-pipelines/prValidate.yml +++ /dev/null @@ -1,35 +0,0 @@ -#Copyright (c) Microsoft Corporation. All rights reserved. -#Licensed under the MIT License. -#Build and test Java Core to make sure a valid pull request is being made -#Validate that the versions dont conflict with those online in case a pull request is made to main or master - -pr: - branches: - include: - - dev - - main - - master - paths: - exclude: - - .gradle/wrapper - - .gitignore - - CONTRIBUTING.md - - LICENSE - - THIRD PARTY NOTICES - - gradle.properties - - gradlew - - gradlew.bat - - readme.md - - settings.gradle - - Scripts/* - -trigger: none # disable triggers based on commits. - -pool: - vmImage: windows-latest - -steps: -- template: templates/build/checkout-and-credscan.yml -- template: templates/build/install-java.yml -- template: templates/build/build-and-coverage.yml -- template: templates/alert-failure.yml