Merge pull request #147 from theohbrothers/enhancement/ci-simplify-az…

…ure-pipelines-generate-and-release-remote-templates Enhancement (ci): Simplify azure-pipelines generate and release remote templates
theohbrothers · Jul 9, 2024 · f656de8 · f656de8
2 parents 265cc64 + 6292321
commit f656de8
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 30 deletions.
diff --git a/templates/azure-pipelines/entrypoint/generate.yml b/templates/azure-pipelines/entrypoint/generate.yml
@@ -9,13 +9,7 @@ steps:
     ### Begin CI-specific code: Get the namspace, project name, and tag ref
     $matchInfo = $env:BUILD_SOURCEBRANCH | Select-String -Pattern '^refs\/tags\/(.*)'
     $env:RELEASE_TAG_REF = if ($matchInfo) { $matchInfo.Matches.Groups[1].Value } else { $null }
-    $matchInfo = $env:BUILD_REPOSITORY_URI | Select-String -Pattern '^https:\/\/github.com\/(.*?)\/(.*)'
-    $env:RELEASE_NAMESPACE = if ($matchInfo) { $matchInfo.Matches.Groups[1].Value } else { $null }
-    $env:RELEASE_REPOSITORY = if ($matchInfo) { $matchInfo.Matches.Groups[2].Value } else { $null }
     ### End of CI-specific code
-    "Namespace: '$env:RELEASE_NAMESPACE'" | Write-Host
-    "Repository: '$env:RELEASE_REPOSITORY'" | Write-Host
-    "Tag ref: '$env:RELEASE_TAG_REF'" | Write-Host
     $VerbosePreference = 'Continue'
     $releaseNotesPath = .\build\PSRepositoryReleaseManager\src\scripts\ci\Invoke-Generate.ps1
     Get-Content -Path $releaseNotesPath

diff --git a/templates/azure-pipelines/entrypoint/powershell/generate.yml b/templates/azure-pipelines/entrypoint/powershell/generate.yml
@@ -9,13 +9,7 @@ steps:
     ### Begin CI-specific code: Get the namspace, project name, and tag ref
     $matchInfo = $env:BUILD_SOURCEBRANCH | Select-String -Pattern '^refs\/tags\/(.*)'
     $env:RELEASE_TAG_REF = if ($matchInfo) { $matchInfo.Matches.Groups[1].Value } else { $null }
-    $matchInfo = $env:BUILD_REPOSITORY_URI | Select-String -Pattern '^https:\/\/github.com\/(.*?)\/(.*)'
-    $env:RELEASE_NAMESPACE = if ($matchInfo) { $matchInfo.Matches.Groups[1].Value } else { $null }
-    $env:RELEASE_REPOSITORY = if ($matchInfo) { $matchInfo.Matches.Groups[2].Value } else { $null }
     ### End of CI-specific code
-    "Namespace: '$env:RELEASE_NAMESPACE'" | Write-Host
-    "Repository: '$env:RELEASE_REPOSITORY'" | Write-Host
-    "Tag ref: '$env:RELEASE_TAG_REF'" | Write-Host
     $VerbosePreference = 'Continue'
     $releaseNotesPath = .\build\PSRepositoryReleaseManager\src\scripts\ci\Invoke-Generate.ps1
     Get-Content -Path $releaseNotesPath

diff --git a/templates/azure-pipelines/entrypoint/powershell/release.yml b/templates/azure-pipelines/entrypoint/powershell/release.yml
@@ -17,13 +17,10 @@ steps:
     $env:RELEASE_NAMESPACE = if ($matchInfo) { $matchInfo.Matches.Groups[1].Value } else { $null }
     $env:RELEASE_REPOSITORY = if ($matchInfo) { $matchInfo.Matches.Groups[2].Value } else { $null }
     ### End of CI-specific code
-    "Namespace: '$env:RELEASE_NAMESPACE'" | Write-Host
-    "Repository: '$env:RELEASE_REPOSITORY'" | Write-Host
-    "Tag ref: '$env:RELEASE_TAG_REF'" | Write-Host
     $VerbosePreference = 'Continue'
     .\build\PSRepositoryReleaseManager\src\scripts\ci\Invoke-Release.ps1 > $null
   displayName: Create GitHub release
-  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
+  condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
   env:
     GITHUB_API_TOKEN: $(GITHUB_API_TOKEN)
     RELEASE_NAME: ${{ parameters['RELEASE_NAME'] }}

diff --git a/templates/azure-pipelines/entrypoint/pwsh/generate.yml b/templates/azure-pipelines/entrypoint/pwsh/generate.yml
@@ -9,13 +9,7 @@ steps:
     ### Begin CI-specific code: Get the namspace, project name, and tag ref
     $matchInfo = $env:BUILD_SOURCEBRANCH | Select-String -Pattern '^refs\/tags\/(.*)'
     $env:RELEASE_TAG_REF = if ($matchInfo) { $matchInfo.Matches.Groups[1].Value } else { $null }
-    $matchInfo = $env:BUILD_REPOSITORY_URI | Select-String -Pattern '^https:\/\/github.com\/(.*?)\/(.*)'
-    $env:RELEASE_NAMESPACE = if ($matchInfo) { $matchInfo.Matches.Groups[1].Value } else { $null }
-    $env:RELEASE_REPOSITORY = if ($matchInfo) { $matchInfo.Matches.Groups[2].Value } else { $null }
     ### End of CI-specific code
-    "Namespace: '$env:RELEASE_NAMESPACE'" | Write-Host
-    "Repository: '$env:RELEASE_REPOSITORY'" | Write-Host
-    "Tag ref: '$env:RELEASE_TAG_REF'" | Write-Host
     $VerbosePreference = 'Continue'
     $releaseNotesPath = .\build\PSRepositoryReleaseManager\src\scripts\ci\Invoke-Generate.ps1
     Get-Content -Path $releaseNotesPath

diff --git a/templates/azure-pipelines/entrypoint/pwsh/release.yml b/templates/azure-pipelines/entrypoint/pwsh/release.yml
@@ -17,13 +17,10 @@ steps:
     $env:RELEASE_NAMESPACE = if ($matchInfo) { $matchInfo.Matches.Groups[1].Value } else { $null }
     $env:RELEASE_REPOSITORY = if ($matchInfo) { $matchInfo.Matches.Groups[2].Value } else { $null }
     ### End of CI-specific code
-    "Namespace: '$env:RELEASE_NAMESPACE'" | Write-Host
-    "Repository: '$env:RELEASE_REPOSITORY'" | Write-Host
-    "Tag ref: '$env:RELEASE_TAG_REF'" | Write-Host
     $VerbosePreference = 'Continue'
     .\build\PSRepositoryReleaseManager\src\scripts\ci\Invoke-Release.ps1 > $null
   displayName: Create GitHub release
-  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
+  condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
   env:
     GITHUB_API_TOKEN: $(GITHUB_API_TOKEN)
     RELEASE_NAME: ${{ parameters['RELEASE_NAME'] }}

diff --git a/templates/azure-pipelines/entrypoint/release.yml b/templates/azure-pipelines/entrypoint/release.yml
@@ -17,13 +17,10 @@ steps:
     $env:RELEASE_NAMESPACE = if ($matchInfo) { $matchInfo.Matches.Groups[1].Value } else { $null }
     $env:RELEASE_REPOSITORY = if ($matchInfo) { $matchInfo.Matches.Groups[2].Value } else { $null }
     ### End of CI-specific code
-    "Namespace: '$env:RELEASE_NAMESPACE'" | Write-Host
-    "Repository: '$env:RELEASE_REPOSITORY'" | Write-Host
-    "Tag ref: '$env:RELEASE_TAG_REF'" | Write-Host
     $VerbosePreference = 'Continue'
     .\build\PSRepositoryReleaseManager\src\scripts\ci\Invoke-Release.ps1 > $null
   displayName: Create GitHub release
-  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
+  condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
   env:
     GITHUB_API_TOKEN: $(GITHUB_API_TOKEN)
     RELEASE_NAME: ${{ parameters['RELEASE_NAME'] }}