From fee094230060530b4c8fc724a9c7e668a3f04fba Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Thu, 3 Oct 2024 10:23:39 -0400
Subject: [PATCH] Change asan build to use a self-hosted runner and Ubuntu
 24.04.

---
 .github/workflows/asan.yaml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/asan.yaml b/.github/workflows/asan.yaml
index fd3054aabbef..b8b90335393c 100644
--- a/.github/workflows/asan.yaml
+++ b/.github/workflows/asan.yaml
@@ -11,16 +11,14 @@ on:
   pull_request:  # Automatically trigger on pull requests affecting this file
     branches:
       - main
-    paths:
-      - '**workflows/asan.yml'
 
 jobs:
-  upstream-dev:
-    runs-on: ubuntu-20.04-16core
+  asan:
+    runs-on: linux-x86-n2-64
+    container:
+      image: ubuntu:24.04
     strategy:
       fail-fast: false
-      matrix:
-        python-version: ["3.12"]
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
         with:
@@ -31,11 +29,11 @@ jobs:
           path: cpython
           ref: v3.12.6
       - name: Install clang 18
+        env:
+          DEBIAN_FRONTEND: noninteractive
         run: |
-          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
-          echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main | sudo tee -a /etc/apt/sources.list
           sudo apt update
-          sudo apt install clang-18 libstdc++-10-dev
+          sudo apt install clang-18 libstdc++-14-dev
       - name: Build CPython with ASAN enabled
         env:
           ASAN_OPTIONS: detect_leaks=0
@@ -43,7 +41,7 @@ jobs:
           cd cpython
           mkdir ${GITHUB_WORKSPACE}/cpythonasan
           CC=clang-18 ./configure --prefix ${GITHUB_WORKSPACE}/cpythonasan --with-address-sanitizer --without-pymalloc
-          make -j16
+          make -j64
           make install
           ${GITHUB_WORKSPACE}/cpythonasan/bin/python3 -m venv ${GITHUB_WORKSPACE}/venv
       - name: Install JAX test requirements