From faf83a696ade2165253704fafa162e94d7397ffa Mon Sep 17 00:00:00 2001 From: Ivan Pozdeev Date: Wed, 5 Aug 2026 21:51:58 +0300 Subject: [PATCH] Revert "Add macos-26-intel to CI" [no ci] This reverts commit 14ed9c8ae39d748a444a84bacfe532f07d13752b. --- .github/workflows/modified_scripts_build.yml | 30 +++++++------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/workflows/modified_scripts_build.yml b/.github/workflows/modified_scripts_build.yml index 1b1be096..1ce8594c 100644 --- a/.github/workflows/modified_scripts_build.yml +++ b/.github/workflows/modified_scripts_build.yml @@ -43,32 +43,28 @@ jobs: import packaging.version result=[] - def exclude_macos_intel(result, python_version): - result.append({'os':'macos-15-intel','python-version':python_version}) - result.append({'os':'macos-26-intel','python-version':python_version}) - for line in os.environ['versions'].splitlines(): - if m:=re.match(r'miniconda3-\d+\.\d+-(\d+\.\d+.\d+)', line): - version = packaging.version.Version(m.group(1)) + if m:=re.match(r'([^-]+)-(\d+\.\d+)-(\d+\.\d+.\d+)', line): + name, version = m.group(1), packaging.version.Version(m.group(3)) # Miniconda dropped MacOS x64 support - if version >= packaging.version.Version('25.9.1'): - exclude_macos_intel(result, line) + if (name == 'miniconda3' and version >= packaging.version.Version('25.9.1')): + result.append({'os':'macos-15-intel','python-version':line}) - if m:=re.match(r'anaconda3-(\d+\.\d+)', line): - version = packaging.version.Version(m.group(1)) + if m:=re.match(r'([^-]+)-(\d+\.\d+)', line): + name, version = m.group(1), packaging.version.Version(m.group(2)) # Anaconda dropped MacOS x64 support - if version >= packaging.version.Version('2025.12'): - exclude_macos_intel(result, line) + if name == 'anaconda3' and version >= packaging.version.Version('2025.12'): + result.append({'os':'macos-15-intel','python-version':line}) if m:=re.match(r'graalpy[^-]*-(community-)?(\d+\.\d+.\d+)', line): version = packaging.version.Version(m.group(2)) # GraalPy dropped MacOS x64 support if version >= packaging.version.Version('25.0.2'): - exclude_macos_intel(result, line) + result.append({'os':'macos-15-intel','python-version':line}) EOF = str(random.getrandbits(15*8)) @@ -95,7 +91,6 @@ jobs: - macos-15 - macos-15-intel - macos-26 - - macos-26-intel exclude: ${{fromJson(needs.discover_modified_scripts.outputs.versions_macos_build_exclude)}} runs-on: ${{ matrix.os }} steps: @@ -158,12 +153,7 @@ jobs: fail-fast: false matrix: python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions_cpython_only)}} - os: - - macos-14 - - macos-15 - - macos-15-intel - - macos-26 - - macos-26-intel + os: ["macos-14", "macos-15", "macos-15-intel"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v7