Update workflows to combine releases

Combine the releases from this repository and the upstream
actions/python-versions.

Author: colesbury

.github/workflows/create-pr-to-update-manifest.yml

@@ -2,7 +2,7 @@
 # It is designed to create a PR with update of versions-manifest.json when a new release is published
 # The GITHUB_TOKEN secret is used to create versions-manifest.json and publish related PR
 
-name: Create Pull Request
+name: Create Pull Request (called indirectly)
 on:
   workflow_call:
     inputs:
@@ -26,7 +26,7 @@ jobs:
 
     - name: Create versions-manifest.json
       run: |
-        ./helpers/packages-generation/manifest-generator.ps1 -RepositoryFullName "$env:GITHUB_REPOSITORY" `
+        ./nogil-helpers/manifest-generator.ps1 -RepositoryFullName "$env:GITHUB_REPOSITORY" `
                                                              -GitHubAccessToken "${{ secrets.GITHUB_TOKEN }}" `
                                                              -OutputFile "./versions-manifest.json" `
                                                              -ConfigurationFile "./config/${{ inputs.tool-name }}-manifest-config.json"

.github/workflows/create-pr.yml

@@ -4,7 +4,7 @@ on:
 
 jobs:
   create-pr:
-    uses: actions/versions-package-tools/.github/workflows/create-pr-to-update-manifest.yml@main
+    uses: ./.github/workflows/create-pr-to-update-manifest.yml
     with:
       tool-name: "python"
     secrets: inherit

nogil-helpers/manifest-generator.ps1

@@ -20,12 +20,16 @@ param (
     [Parameter(Mandatory)] [string] $ConfigurationFile
 )
 
-Import-Module (Join-Path $PSScriptRoot "../github/github-api.psm1")
+Import-Module (Join-Path $PSScriptRoot "../helpers/github/github-api.psm1")
 Import-Module (Join-Path $PSScriptRoot "manifest-utils.psm1") -Force
 
 $configuration = Read-ConfigurationFile -Filepath $ConfigurationFile
 
 $gitHubApi = Get-GitHubApi -RepositoryFullName $RepositoryFullName -AccessToken $GitHubAccessToken
-$releases = $gitHubApi.GetReleases()
-$versionIndex = Build-VersionsManifest -Releases $releases -Configuration $configuration
+$noGILreleases = $gitHubApi.GetReleases()
+
+$upstreamApi = Get-GitHubApi -RepositoryFullName "actions/python-versions" -AccessToken $GitHubAccessToken
+$releases = $upstreamApi.GetReleases()
+
+$versionIndex = Build-VersionsManifest -Releases $releases -NoGILReleases $noGILreleases -Configuration $configuration
 $versionIndex | ConvertTo-Json -Depth 5 | Out-File $OutputFile -Encoding UTF8NoBOM -Force

nogil-helpers/manifest-utils.psm1

@@ -46,10 +46,12 @@ function Get-VersionFromRelease {
 function Build-VersionsManifest {
     param (
         [Parameter(Mandatory)][array]$Releases,
+        [Parameter(Mandatory)][array]$NoGILReleases,
         [Parameter(Mandatory)][object]$Configuration
     )
 
     $Releases = $Releases | Sort-Object -Property "published_at" -Descending
+    $NoGILReleases = $NoGILReleases | Sort-Object -Property "published_at" -Descending
     $ltsRules = Get-LtsRules -Configuration $Configuration
 
     $versionsHash = @{}
@@ -80,6 +82,42 @@ function Build-VersionsManifest {
         $versionsHash.Add($versionKey, $versionHash)
     }
 
+    $noGILversionsHash = @{}
+    foreach ($release in $NoGILReleases) {
+        if (($release.draft -eq $true) -or ($release.prerelease -eq $true)) {
+            continue
+        }
+
+        [Semver]$version = Get-VersionFromRelease $release
+        $versionKey = $version.ToString()
+
+        if ($noGILversionsHash.ContainsKey($versionKey)) {
+            continue
+        }
+
+        $ltsStatus = Get-VersionLtsStatus -Version $versionKey -LtsRules $ltsRules
+        $stable = $version.PreReleaseLabel ? $false : $true
+        [array]$releaseAssets = $release.assets | Where { $_.Name -ne "hashes.sha256" } | ForEach-Object { New-AssetItem -ReleaseAsset $_ -Configuration $Configuration }
+
+        $versionHash = [PSCustomObject]@{}
+        $versionHash | Add-Member -Name "version" -Value $versionKey -MemberType NoteProperty
+        $versionHash | Add-Member -Name "stable" -Value $stable -MemberType NoteProperty
+        if ($ltsStatus) {
+            $versionHash | Add-Member -Name "lts" -Value $ltsStatus -MemberType NoteProperty
+        }
+        $versionHash | Add-Member -Name "release_url" -Value $release.html_url -MemberType NoteProperty
+        $versionHash | Add-Member -Name "files" -Value $releaseAssets -MemberType NoteProperty
+
+        if ($versionsHash.ContainsKey($versionKey)) {
+            # filter out filenames already in the versionsHash
+            $releaseAssets = $releaseAssets | Where-Object { $versionsHash[$versionKey].files.filename -notcontains $_.filename }
+            $versionsHash[$versionKey].files += $releaseAssets
+        } else {
+            $versionsHash.Add($versionKey, $versionHash)
+        }
+        $noGILversionsHash.Add($versionKey, $versionHash)
+    }
+
     # Sort versions by descending
     return $versionsHash.Values | Sort-Object -Property @{ Expression = { [Semver]$_.version }; Descending = $true }
 }