From e1d674fb230287cc228a29110963f8f6f821dea9 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 20 Jun 2025 12:04:44 -0400 Subject: [PATCH 1/7] ci: removes persistredentials --- .azure-pipelines/ci-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 0f96d7671b2..b39fe697923 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -43,7 +43,6 @@ extends: #TODO maybe missing template context with sdl baselines? steps: - checkout: self - persistCredentials: true - task: JavaToolInstaller@1 inputs: From 45132613d0bb237e23d6f6981da15001b7e24d74 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 20 Jun 2025 12:05:13 -0400 Subject: [PATCH 2/7] ci: fixes zip path --- .azure-pipelines/ci-build.yml | 2 +- scripts/zipPackageContent.ps1 | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index b39fe697923..42518c30d1e 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -100,7 +100,7 @@ extends: displayName: Inspect contents of local Maven cache - pwsh: | - .\scripts\zipPackageContent.ps1 -OutputDirectory $Env:OUTPUT_DIRECTORY -ArtifactId microsoft-graph -PackageSegment abstractions -Version $(PACKAGE_VERSION) + .\scripts\zipPackageContent.ps1 -OutputDirectory $Env:OUTPUT_DIRECTORY -ArtifactId microsoft-graph -Version $(PACKAGE_VERSION) echo "list of zips:" Get-ChildItem -Path $Env:OUTPUT_DIRECTORY -Filter "*.zip" | ForEach-Object { Write-Host $_.FullName } displayName: Zip contents of local Maven cache diff --git a/scripts/zipPackageContent.ps1 b/scripts/zipPackageContent.ps1 index d934c024ab0..4bb4653f7ce 100644 --- a/scripts/zipPackageContent.ps1 +++ b/scripts/zipPackageContent.ps1 @@ -1,18 +1,17 @@ # Checks that expected files are present & have contents after the publish process to the local cache param( [Parameter(Mandatory=$true)][string] $ArtifactId, - [Parameter(Mandatory=$true)][string] $PackageSegment, [Parameter(Mandatory=$true)][string] $Version, [Parameter(Mandatory=$true)][string] $OutputDirectory, - [Parameter()][string] $GroupId = "com.microsoft.kiota", + [Parameter()][string] $GroupId = "com.microsoft.graph", [Parameter()][string] $ComponentsSegment = "..\components", [Parameter()][string] $buildOutDir = "build\publishing-repository" ) -#components\bundle\build\publishing-repository\com\microsoft\kiota\microsoft-kiota-bundle\1.8.5\ +#build\publishing-repository\com\microsoft\kiota\microsoft-kiota-bundle\1.8.5\ $groupIdPath = $GroupId -replace "\.", [System.IO.Path]::DirectorySeparatorChar -$packageFullPath = Join-Path -Path $PSScriptRoot -ChildPath $ComponentsSegment -AdditionalChildPath $PackageSegment, $buildOutDir, $groupIdPath, $ArtifactId, $Version +$packageFullPath = Join-Path -Path $PSScriptRoot -ChildPath $buildOutDir -AdditionalChildPath $groupIdPath, $ArtifactId, $Version Write-Output "---------------------------------------------------" Write-Output "Zipping package contents at $packageFullPath" From 79ca8401bb38fbc012b8dcdf60134958b0559667 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 20 Jun 2025 12:14:23 -0400 Subject: [PATCH 3/7] ci: makes the version matching script more tolerant to different spacing --- .azure-pipelines/ci-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 42518c30d1e..1248b883d34 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -83,9 +83,9 @@ extends: - pwsh: | $contents = Get-Content gradle.properties -Raw - $major = $contents | Select-String -Pattern 'mavenMajorVersion = ([0-9]+)' | ForEach-Object { $_.Matches.Groups[1].Value } - $minor = $contents | Select-String -Pattern 'mavenMinorVersion = ([0-9]+)' | ForEach-Object { $_.Matches.Groups[1].Value } - $patch = $contents | Select-String -Pattern 'mavenPatchVersion = ([0-9]+)' | ForEach-Object { $_.Matches.Groups[1].Value } + $major = $contents | Select-String -Pattern 'mavenMajorVersion\s*=\s*([0-9]+)' | ForEach-Object { $_.Matches.Groups[1].Value } + $minor = $contents | Select-String -Pattern 'mavenMinorVersion\s*=\s*([0-9]+)' | ForEach-Object { $_.Matches.Groups[1].Value } + $patch = $contents | Select-String -Pattern 'mavenPatchVersion\s*=\s*([0-9]+)' | ForEach-Object { $_.Matches.Groups[1].Value } # $snapshot_suffix = if ($Env:BRANCH_NAME.StartsWith('refs/tags/v')) { '' } else { '-SNAPSHOT' } $version = "$major.$minor.$patch$snapshot_suffix" echo "Current version is $version" From 65dcc192d2bcd0fd1a31edb6ea6d56468fb5df1c Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 20 Jun 2025 12:18:47 -0400 Subject: [PATCH 4/7] ci: additional zip fixes --- scripts/zipPackageContent.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/zipPackageContent.ps1 b/scripts/zipPackageContent.ps1 index 4bb4653f7ce..39dba6d925f 100644 --- a/scripts/zipPackageContent.ps1 +++ b/scripts/zipPackageContent.ps1 @@ -4,14 +4,13 @@ param( [Parameter(Mandatory=$true)][string] $Version, [Parameter(Mandatory=$true)][string] $OutputDirectory, [Parameter()][string] $GroupId = "com.microsoft.graph", - [Parameter()][string] $ComponentsSegment = "..\components", [Parameter()][string] $buildOutDir = "build\publishing-repository" ) #build\publishing-repository\com\microsoft\kiota\microsoft-kiota-bundle\1.8.5\ $groupIdPath = $GroupId -replace "\.", [System.IO.Path]::DirectorySeparatorChar -$packageFullPath = Join-Path -Path $PSScriptRoot -ChildPath $buildOutDir -AdditionalChildPath $groupIdPath, $ArtifactId, $Version +$packageFullPath = Join-Path -Path $PSScriptRoot -ChildPath ".." -AdditionalChildPath $buildOutDir, $groupIdPath, $ArtifactId, $Version Write-Output "---------------------------------------------------" Write-Output "Zipping package contents at $packageFullPath" From 430401deed41387d9fa23d82cdfb29769037c5b9 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 20 Jun 2025 15:09:52 -0400 Subject: [PATCH 5/7] ci: removes zip stage --- .azure-pipelines/ci-build.yml | 25 +++++++------------------ scripts/zipPackageContent.ps1 | 29 ----------------------------- 2 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 scripts/zipPackageContent.ps1 diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 1248b883d34..44ff1c3f570 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -100,18 +100,16 @@ extends: displayName: Inspect contents of local Maven cache - pwsh: | - .\scripts\zipPackageContent.ps1 -OutputDirectory $Env:OUTPUT_DIRECTORY -ArtifactId microsoft-graph -Version $(PACKAGE_VERSION) - echo "list of zips:" - Get-ChildItem -Path $Env:OUTPUT_DIRECTORY -Filter "*.zip" | ForEach-Object { Write-Host $_.FullName } - displayName: Zip contents of local Maven cache - env: - OUTPUT_DIRECTORY: $(Build.ArtifactStagingDirectory) + $packageFullPath = Join-Path -Path "./" -ChildPath "build/publishing-repository/com/microsoft/graph/microsoft-graph" -AdditionalChildPath "$(PACKAGE_VERSION)" + echo "Package full path: $packageFullPath" + echo "##vso[task.setvariable variable=PACKAGE_PATH;]$packageFullPath" + displayName: Get the package full path - task: 1ES.PublishPipelineArtifact@1 displayName: "Publish Artifact: jars" inputs: artifactName: jars - targetPath: "$(Build.ArtifactStagingDirectory)" + targetPath: "$(PACKAGE_PATH)" - stage: deploy # condition: and(or(contains(variables['build.sourceBranch'], 'refs/tags/v'), eq(variables['build.sourceBranch'], '${{ parameters.previewBranch }}')), succeeded()) @@ -136,7 +134,7 @@ extends: deploy: steps: - pwsh: | - $zips = Get-ChildItem -Path "$(Pipeline.Workspace)" -Filter "*.zip" + $zips = Get-ChildItem -Path "$(Pipeline.Workspace)" -Filter "*.jar" $zip = $zips | Select-Object -First 1 $zipName = $zip.Name if ($zipName -match "\d+.\d+.\d+") @@ -147,18 +145,9 @@ extends: } else { - Write-Error "No valid version found in zip file name." + Write-Error "No valid version found in jar file name." exit 1 } - - - pwsh: | - $zips = Get-ChildItem -Path "$(Pipeline.Workspace)" -Filter "*.zip" - foreach ($zip in $zips) { - $targetPath = $zip.FullName.Replace(".zip", "") - Expand-Archive -Path $zip.FullName -DestinationPath $targetPath - Remove-Item -Path $zip.FullName -Force - } - displayName: Unzip artifacts - task: GitHubRelease@1 inputs: diff --git a/scripts/zipPackageContent.ps1 b/scripts/zipPackageContent.ps1 deleted file mode 100644 index 39dba6d925f..00000000000 --- a/scripts/zipPackageContent.ps1 +++ /dev/null @@ -1,29 +0,0 @@ -# Checks that expected files are present & have contents after the publish process to the local cache -param( - [Parameter(Mandatory=$true)][string] $ArtifactId, - [Parameter(Mandatory=$true)][string] $Version, - [Parameter(Mandatory=$true)][string] $OutputDirectory, - [Parameter()][string] $GroupId = "com.microsoft.graph", - [Parameter()][string] $buildOutDir = "build\publishing-repository" -) - -#build\publishing-repository\com\microsoft\kiota\microsoft-kiota-bundle\1.8.5\ - -$groupIdPath = $GroupId -replace "\.", [System.IO.Path]::DirectorySeparatorChar -$packageFullPath = Join-Path -Path $PSScriptRoot -ChildPath ".." -AdditionalChildPath $buildOutDir, $groupIdPath, $ArtifactId, $Version - -Write-Output "---------------------------------------------------" -Write-Output "Zipping package contents at $packageFullPath" - -if(-not (Test-Path -Path $packageFullPath)) { - Write-Output "Package not found in local cache." - exit 1 -} - -$outputFilePath = Join-Path -Path $OutputDirectory -ChildPath "$ArtifactId-$Version.zip" -# removing any existing file -Remove-Item -Path $outputFilePath -ErrorAction SilentlyContinue -# removing any xml files that are not expected in ESRP release -Compress-Archive -Path "$packageFullPath\*" -DestinationPath $outputFilePath - -exit 0 \ No newline at end of file From a0e3ad1b45e04a867a3ee47e743bcb2a7603443b Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 20 Jun 2025 15:30:46 -0400 Subject: [PATCH 6/7] fix: sanity release due to pipeline migration --- .azure-pipelines/ci-build.yml | 22 +-- .github/workflows/preview-and-release.yml | 170 ---------------------- build.gradle | 16 -- 3 files changed, 11 insertions(+), 197 deletions(-) delete mode 100644 .github/workflows/preview-and-release.yml diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 44ff1c3f570..cf36e036ac9 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -67,26 +67,26 @@ extends: - script: ./gradlew --no-daemon publishToMavenLocal -PmavenCentralPublishingEnabled=true -PmavenCentralSnapshotArtifactSuffix="" displayName: Publish to local Maven for verification - # condition: contains(variables['build.sourceBranch'], 'refs/tags/v') + condition: contains(variables['build.sourceBranch'], 'refs/tags/v') - # - script: ./gradlew --no-daemon publishToMavenLocal -PmavenCentralPublishingEnabled=true - # displayName: Publish to local Maven for verification - # condition: not(contains(variables['build.sourceBranch'], 'refs/tags/v')) + - script: ./gradlew --no-daemon publishToMavenLocal -PmavenCentralPublishingEnabled=true + displayName: Publish to local Maven for verification + condition: not(contains(variables['build.sourceBranch'], 'refs/tags/v')) - script: ./gradlew --no-daemon publishMavenPublicationToADORepository -PmavenCentralPublishingEnabled=true -PmavenCentralSnapshotArtifactSuffix="" displayName: Publish to local Maven ADO for ESRP - # condition: contains(variables['build.sourceBranch'], 'refs/tags/v') + condition: contains(variables['build.sourceBranch'], 'refs/tags/v') - # - script: ./gradlew --no-daemon publishMavenPublicationToADORepository -PmavenCentralPublishingEnabled=true - # displayName: Publish to local Maven ADO for ESRP - # condition: not(contains(variables['build.sourceBranch'], 'refs/tags/v')) + - script: ./gradlew --no-daemon publishMavenPublicationToADORepository -PmavenCentralPublishingEnabled=true + displayName: Publish to local Maven ADO for ESRP + condition: not(contains(variables['build.sourceBranch'], 'refs/tags/v')) - pwsh: | $contents = Get-Content gradle.properties -Raw $major = $contents | Select-String -Pattern 'mavenMajorVersion\s*=\s*([0-9]+)' | ForEach-Object { $_.Matches.Groups[1].Value } $minor = $contents | Select-String -Pattern 'mavenMinorVersion\s*=\s*([0-9]+)' | ForEach-Object { $_.Matches.Groups[1].Value } $patch = $contents | Select-String -Pattern 'mavenPatchVersion\s*=\s*([0-9]+)' | ForEach-Object { $_.Matches.Groups[1].Value } - # $snapshot_suffix = if ($Env:BRANCH_NAME.StartsWith('refs/tags/v')) { '' } else { '-SNAPSHOT' } + $snapshot_suffix = if ($Env:BRANCH_NAME.StartsWith('refs/tags/v')) { '' } else { '-SNAPSHOT' } $version = "$major.$minor.$patch$snapshot_suffix" echo "Current version is $version" echo "##vso[task.setvariable variable=PACKAGE_VERSION;]$version" @@ -112,7 +112,7 @@ extends: targetPath: "$(PACKAGE_PATH)" - stage: deploy - # condition: and(or(contains(variables['build.sourceBranch'], 'refs/tags/v'), eq(variables['build.sourceBranch'], '${{ parameters.previewBranch }}')), succeeded()) + condition: and(or(contains(variables['build.sourceBranch'], 'refs/tags/v'), eq(variables['build.sourceBranch'], '${{ parameters.previewBranch }}')), succeeded()) dependsOn: build jobs: - deployment: deploy_github @@ -192,7 +192,7 @@ extends: - deployment: deploy_maven # snapshots are not supported by ESRP release for now, but they are planning to add support. When it happens, simply remove the condition - # condition: and(contains(variables['build.sourceBranch'], 'refs/tags/v'), succeeded()) + condition: and(contains(variables['build.sourceBranch'], 'refs/tags/v'), succeeded()) pool: name: Azure-Pipelines-1ESPT-ExDShared os: linux diff --git a/.github/workflows/preview-and-release.yml b/.github/workflows/preview-and-release.yml deleted file mode 100644 index 8360de0538c..00000000000 --- a/.github/workflows/preview-and-release.yml +++ /dev/null @@ -1,170 +0,0 @@ -name: Maven Preview/Release and GitHub Release - -# TODO: remove the todo entries in build.gradle - -on: - push: - branches: [main] - paths-ignore: - - '.gradle/wrapper' - - '.gitignore' - - 'LICENSE' - - 'THIRD PARTY NOTICES' - - '*.md' - tags: - - "v[0-9]+.[0-9]+.[0-9]+" - workflow_dispatch: - -env: - PREVIEW_TASK: publishToSonatype - PUBLISH_TASK: publishToSonatype closeAndReleaseSonatypeStagingRepository - JAVA_VERSION: 21 - JAVA_DISTRIBUTION: 'temurin' - -permissions: - contents: write - -jobs: - maven_Preview: - if: ${{ github.ref == 'refs/heads/main' }} - environment: - name: maven_central_snapshot - runs-on: ubuntu-latest - needs: validate-package-contents - steps: - - uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: ${{ env.JAVA_DISTRIBUTION}} - cache: gradle - - name: Move generated sources to correct package - run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated' - shell: pwsh - - name: Detect secrets - run: | - pip install detect-secrets - git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline - - name: Download File - run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH - shell: pwsh - env: - ENCODED_VALUE: ${{ secrets.LOCAL_PROPERTIES }} - OUTPUT_PATH: '.\local.properties' - - name: Download File - run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH - shell: pwsh - env: - ENCODED_VALUE: ${{ secrets.SECRING_GPG }} - OUTPUT_PATH: '.\secring.gpg' - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Publish - run: ./gradlew $PREVIEW_TASK - - maven_Release: - if: ${{ startsWith(github.ref, 'refs/tags/') && github.actor == 'release-please[bot]'}} - environment: - name: maven_central_release - runs-on: ubuntu-latest - needs: validate-package-contents - steps: - - uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: ${{ env.JAVA_DISTRIBUTION}} - cache: gradle - - name: Detect secrets - run: | - pip install detect-secrets - git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline - - name: Move generated sources to correct package - run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated' - shell: pwsh - - name: Download File - run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH - shell: pwsh - env: - ENCODED_VALUE: ${{ secrets.LOCAL_PROPERTIES }} - OUTPUT_PATH: '.\local.properties' - - name: Download File - run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH - shell: pwsh - env: - ENCODED_VALUE: ${{ secrets.SECRING_GPG }} - OUTPUT_PATH: '.\secring.gpg' - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Publish - run: ./gradlew $PUBLISH_TASK -PmavenCentralSnapshotArtifactSuffix="" - - name: Upload Build Artifact - uses: actions/upload-artifact@v4 - with: - name: drop - path: | - **/libs/* - build/generated-pom.xml - build/generated-pom.xml.asc - build.gradle - gradlew - gradlew.bat - settings.gradle - gradle.properties - **/gradle/** - scripts/** - - name: GitHub Release - uses: softprops/action-gh-release@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - fail_on_unmatched_files: true - files: | - build/**/*.jar - - validate-package-contents: - runs-on: ubuntu-latest - environment: ${{ contains(github.ref, 'refs/tags/v') && 'maven_central_release' || 'maven_central_snapshot' }} - defaults: - run: - working-directory: ./ - steps: - - uses: actions/checkout@v4 - - name: Setup JDK - uses: actions/setup-java@v4 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: ${{ env.JAVA_DISTRIBUTION}} - cache: gradle - - name: Move generated sources to correct package - run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated' - shell: pwsh - - name: Download file - run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH - shell: pwsh - env: - ENCODED_VALUE: ${{ secrets.LOCAL_PROPERTIES }} - OUTPUT_PATH: 'local.properties' - - name: Download file - run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH - shell: pwsh - env: - ENCODED_VALUE: ${{ secrets.SECRING_GPG }} - OUTPUT_PATH: '.\secring.gpg' - - name: Publish to local Maven cache for validation - run: ./gradlew --no-daemon publishToMavenLocal - - name: Get current SNAPSHOT version - shell: pwsh - run: | - $contents = Get-Content gradle.properties -Raw - $major = $contents | Select-String -Pattern 'mavenMajorVersion\s+= ([0-9]+)' | ForEach-Object { $_.Matches.Groups[1].Value } - $minor = $contents | Select-String -Pattern 'mavenMinorVersion\s+= ([0-9]+)' | ForEach-Object { $_.Matches.Groups[1].Value } - $patch = $contents | Select-String -Pattern 'mavenPatchVersion\s+= ([0-9]+)' | ForEach-Object { $_.Matches.Groups[1].Value } - $version = "$major.$minor.$patch-SNAPSHOT" - echo "Current version is $version" - echo "PACKAGE_VERSION=$version" >> $Env:GITHUB_ENV - - name: Inspect contents of local Maven cache - shell: pwsh - run: | - .\scripts\validatePackageContents.ps1 -ArtifactId microsoft-graph -Version $env:PACKAGE_VERSION diff --git a/build.gradle b/build.gradle index 66224e0ec24..a17cd6e3beb 100644 --- a/build.gradle +++ b/build.gradle @@ -12,8 +12,6 @@ plugins { id 'eclipse' id 'maven-publish' id 'signing' - // TODO remove this dependency once we remove the GH WF - id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' } java { @@ -89,20 +87,6 @@ publishing { } } -// TODO remove this configuration once we remove the GH WF -nexusPublishing { - repositories { - sonatype { - if (project.rootProject.file('local.properties').exists()) { - Properties properties = new Properties() - properties.load(project.rootProject.file('local.properties').newDataInputStream()) - username = properties.getProperty('sonatypeUsername') - password = properties.getProperty('sonatypePassword') - } - } - } -} - group = project.property('mavenGroupId') version = "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenCentralSnapshotArtifactSuffix}" From a13ce43d5dc1d00ea4471d0487a21fe45a641f5c Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 20 Jun 2025 15:44:14 -0400 Subject: [PATCH 7/7] fix: branch name for the CI --- .azure-pipelines/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index cf36e036ac9..c3f49823a93 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -93,7 +93,7 @@ extends: displayName: Get current version name: GetVersion env: - BRANCH_NAME: $(Build.SourceBranchName) + BRANCH_NAME: $(Build.SourceBranch) - pwsh: | .\scripts\validatePackageContents.ps1 -ArtifactId microsoft-graph -Version $(PACKAGE_VERSION) -ValidateMavenMetadata $false