From 749fa6000a2e828b89da2b9b0c25a0c89d509693 Mon Sep 17 00:00:00 2001
From: EXPLOSION <git@helvetica.moe>
Date: Sat, 9 Nov 2024 01:40:57 -0500
Subject: [PATCH] Try removing more

---
 .github/workflows/check-newsfragment.yml | 23 -----------------------
 .github/workflows/ci.yml                 | 13 +------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 .github/workflows/check-newsfragment.yml

diff --git a/.github/workflows/check-newsfragment.yml b/.github/workflows/check-newsfragment.yml
deleted file mode 100644
index 0aa78fcd3..000000000
--- a/.github/workflows/check-newsfragment.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Check newsfragment
-
-on:
-  pull_request:
-    types: [labeled, unlabeled, opened, synchronize]
-    branches:
-    - main
-
-jobs:
-  check-newsfragment:
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip newsfragment') }}
-    runs-on: 'ubuntu-latest'
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Check newsfragments
-        run: |
-          if git diff --name-only origin/main | grep -v '/_tests/' | grep 'src/trio/'; then
-            git diff --name-only origin/main | grep 'newsfragments/' || exit 1
-          fi
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b2d2543d8..77afa1d27 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,23 +2,16 @@ name: CI
 
 on:
   push:
-    branches-ignore:
-      - "dependabot/**"
-  pull_request:
 
 jobs:
   Windows:
-    name: 'Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }})'
+    name: 'Windows (${{ matrix.python }})'
     timeout-minutes: 20
     runs-on: 'windows-latest'
     strategy:
       fail-fast: false
       matrix:
         python: ['pypy-3.10']
-        arch: ['x86', 'x64']
-        lsp: ['']
-        lsp_extract_file: ['']
-        extra_name: ['']
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -34,12 +27,8 @@ jobs:
           # 'CPython' -> '3.9.0-alpha - 3.9.X'
           # 'PyPy'    -> 'pypy-3.9'
           python-version: ${{ fromJSON(format('["{0}", "{1}"]', format('{0}.0-alpha - {0}.X', matrix.python), matrix.python))[startsWith(matrix.python, 'pypy')] }}
-          architecture: '${{ matrix.arch }}'
           cache: pip
           cache-dependency-path: test-requirements.txt
       - name: Run tests
         run: ./ci.sh
         shell: bash
-        env:
-          LSP: '${{ matrix.lsp }}'
-          LSP_EXTRACT_FILE: '${{ matrix.lsp_extract_file }}'