From 714163cc4462da88fda15948adc73c6d116802a3 Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@github.com>
Date: Mon, 11 Jul 2022 16:09:47 +0200
Subject: [PATCH] Disable universal2 macOS builds (#175)

* Disable universal2 macOS builds

* Debug

* Disable universal build and tcl test
---
 builders/macos-python-builder.psm1 |  7 ++++---
 tests/python-tests.ps1             | 10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/builders/macos-python-builder.psm1 b/builders/macos-python-builder.psm1
index 305ae943..23588818 100644
--- a/builders/macos-python-builder.psm1
+++ b/builders/macos-python-builder.psm1
@@ -50,9 +50,10 @@ class macOSPythonBuilder : NixPythonBuilder {
         ### will never be used itself by a Github Actions runner but using a universal2 Python is the only way to build
         ### universal2 C extensions and wheels. This is supported by Python >= 3.10 and was backported to Python >=
         ### 3.9.1 and >= 3.8.10.
-        if ($this.Version -ge "3.8.10" -and $this.Version -ne "3.8.13" -and $this.Version -ne "3.9.0" ) {
-            $configureString += " --enable-universalsdk --with-universal-archs=universal2"
-        }
+        ### Disabled, discussion: https://github.com/actions/python-versions/pull/114
+        # if ($this.Version -ge "3.8.10" -and $this.Version -ne "3.8.13" -and $this.Version -ne "3.9.0" ) {
+        #     $configureString += " --enable-universalsdk --with-universal-archs=universal2"
+        # }
 
         ### OS X 10.11, Apple no longer provides header files for the deprecated system version of OpenSSL.
         ### Solution is to install these libraries from a third-party package manager,
diff --git a/tests/python-tests.ps1 b/tests/python-tests.ps1
index 974cccbc..6d9f1e67 100644
--- a/tests/python-tests.ps1
+++ b/tests/python-tests.ps1
@@ -50,11 +50,11 @@ Describe "Tests" {
     }
 
     # linux has no display name and no $DISPLAY environment variable - skip tk test
-    if (-not (($Platform -match "ubuntu") -or ($Platform -match "linux"))) {
-        It "Check if tcl/tk has the same headed and library versions" {
-	    "python ./sources/tcltk.py" | Should -ReturnZeroExitCode
-        }
-    }
+    # if (-not (($Platform -match "ubuntu") -or ($Platform -match "linux"))) {
+    #     It "Check if tcl/tk has the same headed and library versions" {
+	#     "python ./sources/tcltk.py" | Should -ReturnZeroExitCode
+    #     }
+    # }
 
     if (($Version -ge "3.2.0") -and -not ([semver]"$($Version.Major).$($Version.Minor)" -eq [semver]"3.11" -and $Version.PreReleaseLabel)) {
         It "Check if sqlite3 module is installed" {