Update build-python-packages.yml

.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,ubuntu-24.04_arm64,macos-12_x64,macos-14_arm64,windows-2019_x64,windows-2019_x86,windows-2019_arm64'
+        default: 'setup-actions-windows-arm64-4-core'
   pull_request:
     paths-ignore:
     - 'versions-manifest.json'
@@ -28,20 +28,36 @@ env:
   VERSION: ${{ inputs.VERSION || '3.12.3' }}
 defaults:
   run:
-    shell: pwsh
+    shell: 'C:\Program Files\PowerShell\7\pwsh.exe -Command {0}'
 
 jobs:
-  generate_matrix:
+ install_Pwsh_git:
+   runs-on: setup-actions-windows-arm64-4-core
+
+   steps:
+
+     - run: |
+          Set-ExecutionPolicy Bypass -Scope Process -Force
+          [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
+          iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+          choco install -y pwsh
+          choco install -y git --version=2.18.0
+          'C:\Program Files\PowerShell\7\' | Out-File $env:GITHUB_PATH -Append
+          'C:\Program Files\Git\bin' | Out-File $env:GITHUB_PATH -Append
+       shell: powershell
+      
+ generate_matrix:
+    needs: [install_Pwsh_git]
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.generate-matrix.outputs.matrix }}
     steps:
-      - name: Generate execution matrix
+     - name: Generate execution matrix
-        id: generate-matrix
+       id: generate-matrix
-        run: |
+       run: |
-          [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()
+          [String[]]$configurations = "${{ inputs.platforms || 'ubuntu-20.04,ubuntu-22.04,ubuntu-24.04,macos-11,macos-11_arm64,windows-2019_x64,windows-2019_x86' }}".Split(",").Trim()
           $matrix = @()
-          
+
           foreach ($configuration in $configurations) {
             $parts = $configuration.Split("_")
             $os = $parts[0]
@@ -51,17 +67,6 @@ jobs:
               "*macos*" { $platform = 'darwin' }
               "*windows*" { $platform = 'win32' }
             }
-            
-            if ($configuration -eq "ubuntu-22.04_arm64") {
-              $os = "setup-actions-ubuntu-arm64-2-core"
-            }
-            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
@@ -69,9 +74,10 @@ jobs:
             }
           }
           echo "matrix=$($matrix | ConvertTo-Json -Compress -AsArray)" >> $env:GITHUB_OUTPUT
-          
+
-  build_python:
+ build_python:
-    needs: generate_matrix
+   
+    needs: [install_Pwsh_git, generate_matrix]
     strategy:
       fail-fast: false
       matrix:
@@ -80,40 +86,16 @@ 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
-            Set-ExecutionPolicy Bypass -Scope Process -Force
-            [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
-            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
-        
-            # Install PowerShell
-            choco install powershell-core -y
-            echo "C:\Program Files\PowerShell\7" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-        
-            # Install Git
-            choco install git -y
-            echo "C:\Program Files\Git\cmd" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-        
-            
-             # Install 7-Zip
-            choco install 7zip -y
-            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
+          submodules: false
 
       - 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:
@@ -121,8 +103,8 @@ jobs:
           path: ${{ runner.temp }}/artifact
           if-no-files-found: error
 
-  test_python:
+ test_python:
-    needs: [generate_matrix, build_python]
+    needs: [install_Pwsh_git, generate_matrix, build_python]
     strategy:
       fail-fast: false
       matrix:
@@ -131,33 +113,11 @@ 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
-            Set-ExecutionPolicy Bypass -Scope Process -Force
-            [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
-            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
-        
-            # Install PowerShell
-            choco install powershell-core -y
-            echo "C:\Program Files\PowerShell\7" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-        
-            # Install Git
-            choco install git -y
-            echo "C:\Program Files\Git\cmd" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-        
-            
-             # Install 7-Zip
-            choco install 7zip -y
-            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
+          submodules: false
 
       - name: Fully cleanup the toolcache directory before testing
         run: ./helpers/clean-toolcache.ps1 -ToolName "Python"
@@ -214,7 +174,7 @@ jobs:
 
       - name: Run tests
         run: |
-            Install-Module Pester -Force -Scope CurrentUser -SkipPublisherCheck
+            Install-Module Pester -Force -Scope CurrentUser
             Import-Module Pester
             $pesterContainer = New-PesterContainer -Path './python-tests.ps1' -Data @{
                 Version="${{ env.VERSION }}";
@@ -228,13 +188,14 @@ jobs:
             }
         working-directory: ${{ github.workspace }}/tests
 
-  publish_release:
+ publish_release:
       name: Publish release
       if: github.event_name == 'workflow_dispatch' && inputs.PUBLISH_RELEASES
       needs: test_python
       runs-on: ubuntu-latest
       steps:
       - uses: actions/download-artifact@v4
+        
 
       - name: Publish Release ${{ env.VERSION }}
         id: create_release
@@ -278,7 +239,7 @@ jobs:
               });
             }
 
-  trigger_pr:
+ trigger_pr:
     name: Trigger "Create Pull Request" workflow
     needs: publish_release
     runs-on: ubuntu-latest
@@ -294,3 +255,4 @@ jobs:
             workflow_id: 'create-pr.yml',
             ref: 'main'
           });
+

.github/workflows/codeql-analysis.yml

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

builders/nix-python-builder.psm1

@@ -97,7 +97,6 @@ class NixPythonBuilder : PythonBuilder {
 
         $variablesToReplace = @{
             "{{__VERSION_FULL__}}" = $this.Version;
-            "{{__ARCH__}}" = $this.Architecture;
         }
         $variablesToReplace.keys | ForEach-Object { $installationTemplateContent = $installationTemplateContent.Replace($_, $variablesToReplace[$_]) }
 

builders/win-python-builder.psm1

@@ -60,8 +60,6 @@ class WinPythonBuilder : PythonBuilder {
             } else {
                 $ArchitectureExtension = ".amd64"
             }
-        }elseif ($this.Architecture -eq "arm64") {
-                $ArchitectureExtension = "-arm64"
         }
 
         return $ArchitectureExtension

installers/nix-setup-template.sh

@@ -1,7 +1,6 @@
 set -e
 
 PYTHON_FULL_VERSION="{{__VERSION_FULL__}}"
-ARCH="{{__ARCH__}}"
 MAJOR_VERSION=$(echo $PYTHON_FULL_VERSION | cut -d '.' -f 1)
 MINOR_VERSION=$(echo $PYTHON_FULL_VERSION | cut -d '.' -f 2)
 
@@ -18,7 +17,7 @@ fi
 
 PYTHON_TOOLCACHE_PATH=$TOOLCACHE_ROOT/Python
 PYTHON_TOOLCACHE_VERSION_PATH=$PYTHON_TOOLCACHE_PATH/$PYTHON_FULL_VERSION
-PYTHON_TOOLCACHE_VERSION_ARCH_PATH=$PYTHON_TOOLCACHE_VERSION_PATH/$ARCH
+PYTHON_TOOLCACHE_VERSION_ARCH_PATH=$PYTHON_TOOLCACHE_VERSION_PATH/x64
 
 echo "Check if Python hostedtoolcache folder exist..."
 if [ ! -d $PYTHON_TOOLCACHE_PATH ]; then
@@ -55,4 +54,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/x64.complete

tests/sources/python-config-test.py

@@ -28,7 +28,7 @@ if os_type == 'Darwin': expected_ld_library_extension = 'dylib'
 if pkg_installer:
     expected_lib_dir_path = f'/Library/Frameworks/Python.framework/Versions/{version_major}.{version_minor}/lib'
 else:
-    expected_lib_dir_path = f'{os.getenv("AGENT_TOOLSDIRECTORY")}/Python/{version}/{architecture}/lib'
+    expected_lib_dir_path = f'{os.getenv("AGENT_TOOLSDIRECTORY")}/Python/{version}/x64/lib'
 
 # Check modules
 ### Validate libraries path