Update versions-manifest (#306)

Co-authored-by: Service account <no-reply@microsoft.com>

.github/workflows/build-python-packages.yml

@@ -15,7 +15,7 @@ on:
       PLATFORMS:
         description: 'Platforms for execution in "os" or "os_arch" format (arch is "x64" by default)'
         required: true
-        default: 'ubuntu-20.04,ubuntu-22.04,ubuntu-22.04_arm64,ubuntu-24.04,macos-11_x64,macos-14_arm64,windows-2019_x64,windows-2019_x86,windows-2019_arm64'
+        default: 'ubuntu-20.04,ubuntu-22.04,ubuntu-22.04_arm64,ubuntu-24.04,ubuntu-24.04_arm64,macos-12_x64,macos-14_arm64,windows-2019_x64,windows-2019_x86,windows-2019_arm64'
   pull_request:
     paths-ignore:
     - 'versions-manifest.json'
@@ -39,31 +39,33 @@ jobs:
       - name: Generate execution matrix
         id: generate-matrix
         run: |
-          [String[]]$configurations = "${{ inputs.platforms || 'ubuntu-20.04,ubuntu-22.04,ubuntu-22.04_arm64,ubuntu-24.04,macos-11,macos-14_arm64,windows-2019_x64,windows-2019_x86,windows-2019_arm64' }}".Split(",").Trim()
+          [String[]]$configurations = "${{ inputs.platforms || 'ubuntu-20.04,ubuntu-22.04,ubuntu-22.04_arm64,ubuntu-24.04,ubuntu-24.04_arm64,macos-12,macos-14_arm64,windows-2019_x64,windows-2019_x86,windows-2019_arm64' }}".Split(",").Trim()
           $matrix = @()
-
+          
           foreach ($configuration in $configurations) {
             $parts = $configuration.Split("_")
             $os = $parts[0]
             $arch = if ($parts[1]) {$parts[1]} else {"x64"}
-
             switch -wildcard ($os) {
               "*ubuntu*" { $platform = $os.Replace("ubuntu","linux")}
               "*macos*" { $platform = 'darwin' }
               "*windows*" { $platform = 'win32' }
             }
-
+            
             if ($configuration -eq "ubuntu-22.04_arm64") {
               $os = "setup-actions-ubuntu-arm64-2-core"
-            }elseif ($configuration -eq "windows-2019_arm64") {
+            }
+            elseif ($configuration -eq "ubuntu-24.04_arm64") {
+              $os = "setup-actions-ubuntu24-arm64-2-core"
+            }
+            elseif ($configuration -eq "windows-2019_arm64") {
               $os = "setup-actions-windows-arm64-4-core"
             }
+            
             $matrix += @{
               'platform' = $platform
               'os' = $os
               'arch' = $arch
-              
-
             }
           }
           echo "matrix=$($matrix | ConvertTo-Json -Compress -AsArray)" >> $env:GITHUB_OUTPUT
@@ -78,39 +80,40 @@ jobs:
     env:
       ARTIFACT_NAME: python-${{ inputs.VERSION || '3.12.3' }}-${{ matrix.platform }}-${{ matrix.arch }}
     steps:
-
       - name: Setup Environment on Windows ARM64 Runner
         if: matrix.os == 'setup-actions-windows-arm64-4-core'
         shell: powershell
         run: |
-          # Install Chocolatey
+            # Install Chocolatey
-          Set-ExecutionPolicy Bypass -Scope Process -Force
+            Set-ExecutionPolicy Bypass -Scope Process -Force
-          [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
+            [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
-          iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+            iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-          echo "C:\ProgramData\Chocolatey\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+            echo "C:\ProgramData\Chocolatey\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-      
+        
-          # Install PowerShell
+            # Install PowerShell
-          choco install powershell-core -y
+            choco install powershell-core -y
-          echo "C:\Program Files\PowerShell\7" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+            echo "C:\Program Files\PowerShell\7" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-      
+        
-          # Install Git
+            # Install Git
-          choco install git -y
+            choco install git -y
-          echo "C:\Program Files\Git\cmd" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+            echo "C:\Program Files\Git\cmd" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-      
+        
-          
+            
-           # Install 7-Zip
+             # Install 7-Zip
-          choco install 7zip -y
+            choco install 7zip -y
-          echo "C:\ProgramData\chocolatey\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+            echo "C:\ProgramData\chocolatey\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+            
+
       - name: Check out repository code
         uses: actions/checkout@v4
         with:
           submodules: true
 
-    
       - name: Build Python ${{ env.VERSION }}
         run: |
           ./builders/build-python.ps1 -Version $env:VERSION `
                   -Platform ${{ matrix.platform }} -Architecture ${{ matrix.arch }}
+                  
       - name: Publish artifact
         uses: actions/upload-artifact@v4
         with:
@@ -128,30 +131,29 @@ jobs:
     env:
       ARTIFACT_NAME: python-${{ inputs.VERSION || '3.12.3' }}-${{ matrix.platform }}-${{ matrix.arch }}
     steps:
-    
       - name: Setup Environment on Windows ARM64 Runner
         if: matrix.os == 'setup-actions-windows-arm64-4-core'
         shell: powershell
         run: |
-          # Install Chocolatey
+            # Install Chocolatey
-          Set-ExecutionPolicy Bypass -Scope Process -Force
+            Set-ExecutionPolicy Bypass -Scope Process -Force
-          [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
+            [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
-          iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+            iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-          echo "C:\ProgramData\Chocolatey\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+            echo "C:\ProgramData\Chocolatey\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-      
+        
-          # Install PowerShell
+            # Install PowerShell
-          choco install powershell-core -y
+            choco install powershell-core -y
-          echo "C:\Program Files\PowerShell\7" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+            echo "C:\Program Files\PowerShell\7" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-      
+        
-          # Install Git
+            # Install Git
-          choco install git -y
+            choco install git -y
-          echo "C:\Program Files\Git\cmd" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+            echo "C:\Program Files\Git\cmd" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-      
+        
-          
+            
-           # Install 7-Zip
+             # Install 7-Zip
-          choco install 7zip -y
+            choco install 7zip -y
-          echo "C:\ProgramData\chocolatey\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+            echo "C:\ProgramData\chocolatey\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-          
+            
       - name: Check out repository code
         uses: actions/checkout@v4
         with:
@@ -171,7 +173,6 @@ jobs:
           name: ${{ env.ARTIFACT_NAME }}
           path: ${{ runner.temp }}/${{ env.ARTIFACT_NAME }}
 
-    
       - name: Extract files
         run: |
           if ('${{ matrix.platform }}' -eq 'win32') {
@@ -210,6 +211,7 @@ jobs:
         run: |
           $pythonLocation = which python
           if ('${{ matrix.platform }}' -eq 'darwin') { otool -L $pythonLocation } else { ldd $pythonLocation }
+
       - name: Run tests
         run: |
             Install-Module Pester -Force -Scope CurrentUser -SkipPublisherCheck
@@ -244,6 +246,7 @@ jobs:
           release_name: ${{ env.VERSION }}
           body: |
             Python ${{ env.VERSION }}
+
       - name: Generate hash for packages
         run: |
           $childItems = Get-Childitem -Path '.'

.github/workflows/codeql-analysis.yml

@@ -13,4 +13,5 @@ jobs:
     name: CodeQL analysis 
     uses: actions/reusable-workflows/.github/workflows/codeql-analysis.yml@main
     with:
-     languages: "['python']"
+     languages: '["python"]'
+   

builders/nix-python-builder.psm1

@@ -0,0 +1,169 @@
+using module "./python-builder.psm1"
+
+class NixPythonBuilder : PythonBuilder {
+    <#
+    .SYNOPSIS
+    Base Python builder class for *Nix systems.
+
+    .DESCRIPTION
+    Contains methods that required to build Python artifact for *nix systems. Inherited from base PythonBuilder class.
+
+    .PARAMETER version
+    The version of Python that should be built.
+
+    .PARAMETER Platform
+    The type of platform for which Python should be built.
+
+    .PARAMETER PlatformVersion
+    The version of platform for which Python should be built.
+
+    .PARAMETER InstallationTemplateName
+    The name of template that will be used to create installation script for generated Python artifact.
+
+    .PARAMETER InstallationScriptName	
+    The name of installation script that will be generated for Python artifact.
+
+    .PARAMETER OutputArtifactName
+    The name of archive with Python binaries that will be generated as part of Python artifact. 
+
+    #>
+
+    [string] $InstallationTemplateName
+    [string] $InstallationScriptName
+    [string] $OutputArtifactName
+
+    NixPythonBuilder(
+        [semver] $version,
+        [string] $architecture,
+        [string] $platform
+    ) : Base($version, $architecture, $platform) {
+        $this.InstallationTemplateName = "nix-setup-template.sh"	
+        $this.InstallationScriptName = "setup.sh"
+        $this.OutputArtifactName = "python-$Version-$Platform-$Architecture.tar.gz"
+    }
+
+    [uri] GetSourceUri() {
+        <#
+        .SYNOPSIS
+        Get base Python URI and return complete URI for Python sources.
+        #>
+
+        $base = $this.GetBaseUri()
+        $versionName = $this.GetBaseVersion()
+        $nativeVersion = Convert-Version -version $this.Version
+
+        return "${base}/${versionName}/Python-${nativeVersion}.tgz"
+    }
+
+    [string] GetPythonBinary() {
+        <#
+        .SYNOPSIS
+        Return name of Python binary.
+        #>
+
+        if ($this.Version.Major -eq 2) { $pythonBinary = "python" } else { $pythonBinary = "python3" }
+        return $pythonBinary
+    }
+
+    [string] Download() {
+        <#
+        .SYNOPSIS
+        Download Python sources and extract them at temporary work folder. Returns expanded archive location path.
+        #>
+
+        $sourceUri = $this.GetSourceUri()
+        Write-Host "Sources URI: $sourceUri"
+
+        $archiveFilepath = Download-File -Uri $sourceUri -OutputFolder $this.WorkFolderLocation
+        $expandedSourceLocation = Join-Path -Path $this.TempFolderLocation -ChildPath "SourceCode"
+        New-Item -Path $expandedSourceLocation -ItemType Directory
+
+        Extract-TarArchive -ArchivePath $archiveFilepath -OutputDirectory $expandedSourceLocation
+        Write-Debug "Done; Sources location: $expandedSourceLocation"
+
+        return $expandedSourceLocation
+    }
+
+    [void] CreateInstallationScript() {
+        <#
+        .SYNOPSIS
+        Create Python artifact installation script based on template specified in InstallationTemplateName property.
+        #>
+
+        $installationScriptLocation = New-Item -Path $this.WorkFolderLocation -Name $this.InstallationScriptName -ItemType File
+        $installationTemplateLocation = Join-Path -Path $this.InstallationTemplatesLocation -ChildPath $this.InstallationTemplateName
+
+        $installationTemplateContent = Get-Content -Path $installationTemplateLocation -Raw
+
+        $variablesToReplace = @{
+            "{{__VERSION_FULL__}}" = $this.Version;
+            "{{__ARCH__}}" = $this.Architecture;
+        }
+        $variablesToReplace.keys | ForEach-Object { $installationTemplateContent = $installationTemplateContent.Replace($_, $variablesToReplace[$_]) }
+
+        $installationTemplateContent | Out-File -FilePath $installationScriptLocation
+
+        Write-Debug "Done; Installation script location: $installationScriptLocation)"
+    }
+
+    [void] Make() {
+        <#
+        .SYNOPSIS
+        Executes "make" and "make install" commands for configured build sources. Make output will be writen in build_output.txt located in artifact location folder.
+        #>
+
+        Write-Debug "make Python $($this.Version)-$($this.Architecture) $($this.Platform)"
+        $buildOutputLocation = New-Item -Path $this.WorkFolderLocation -Name "build_output.txt" -ItemType File
+        
+        Execute-Command -Command "make 2>&1 | tee $buildOutputLocation" -ErrorAction Continue	
+        Execute-Command -Command "make install" -ErrorAction Continue
+
+        Write-Debug "Done; Make log location: $buildOutputLocation"
+    }
+
+    [void] CopyBuildResults() {
+        $buildFolder = $this.GetFullPythonToolcacheLocation()
+        Move-Item -Path "$buildFolder/*" -Destination $this.WorkFolderLocation
+    }
+
+    [void] ArchiveArtifact() {
+        $OutputPath = Join-Path $this.ArtifactFolderLocation $this.OutputArtifactName
+        Create-TarArchive -SourceFolder $this.WorkFolderLocation -ArchivePath $OutputPath
+    }
+
+    [void] Build() {
+        <#
+        .SYNOPSIS
+        Build Python artifact from sources. 
+        #>
+
+        Write-Host "Prepare Python Hostedtoolcache location..."
+        $this.PreparePythonToolcacheLocation()
+
+        Write-Host "Prepare system environment..."
+        $this.PrepareEnvironment()
+
+        Write-Host "Download Python $($this.Version)[$($this.Architecture)] sources..."
+        $sourcesLocation = $this.Download()
+
+        Push-Location -Path $sourcesLocation
+        Write-Host "Configure for $($this.Platform)..."
+        $this.Configure()
+
+        Write-Host "Make for $($this.Platform)..."
+        $this.Make()
+        Pop-Location
+
+        Write-Host "Generate structure dump"
+        New-ToolStructureDump -ToolPath $this.GetFullPythonToolcacheLocation() -OutputFolder $this.WorkFolderLocation
+
+        Write-Host "Copying build results to destination location"
+        $this.CopyBuildResults()
+
+        Write-Host "Create installation script..."
+        $this.CreateInstallationScript()
+
+        Write-Host "Archive artifact..."
+        $this.ArchiveArtifact()
+    }
+}

builders/win-python-builder.psm1

@@ -1,4 +1,3 @@
-
 using module "./python-builder.psm1"
 
 class WinPythonBuilder : PythonBuilder {
@@ -65,7 +64,6 @@ class WinPythonBuilder : PythonBuilder {
                 $ArchitectureExtension = "-arm64"
         }
 
-
         return $ArchitectureExtension
     }
 

installers/nix-setup-template.sh

@@ -55,4 +55,4 @@ export PIP_ROOT_USER_ACTION=ignore
 ./python -m pip install --upgrade --force-reinstall pip --disable-pip-version-check --no-warn-script-location
 
 echo "Create complete file"
-touch $PYTHON_TOOLCACHE_VERSION_PATH/$ARCH.complete
+touch $PYTHON_TOOLCACHE_VERSION_PATH/$ARCH.complete