From a8ccc5d4739700edc03cb1bb7a09b828e82a0716 Mon Sep 17 00:00:00 2001
From: David Chisnall <davidchisnall@users.noreply.github.com>
Date: Wed, 4 Aug 2021 15:07:33 +0100
Subject: [PATCH] Fix status badge and LLVM fetching for qemu builds (#362)

The status badge should report the most recent status for the master
branch, not the most recent actions run.

llvm.sh wasn't updated when trunk moved to 14 so was failing to fetch clang-13 (which is now in the llvm-toolchain-focal-13 repo, not the llvm-toolchain-focal repo).  Duplicate the correct logic here rather than relying on the external script.
---
 .github/workflows/main.yml | 8 ++++----
 README.md                  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 808b6d0..99fe32a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -106,10 +106,10 @@ jobs:
       # Install the dependencies and clang 13.  Earlier versions of clang don't
       # find the multilib things for this week's Ubuntu filesystem layout.
       run: |
-        wget https://apt.llvm.org/llvm.sh
-        chmod +x llvm.sh
-        sudo ./llvm.sh 13
-        sudo apt install libstdc++-9-dev-${{ matrix.arch }}-cross qemu-user ninja-build lld-13 clang-13
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+        sudo add-apt-repository "deb http://apt.llvm.org/focal/     llvm-toolchain-focal-13  main"
+        sudo apt update
+        sudo apt install libstdc++-9-dev-${{ matrix.arch }}-cross qemu-user ninja-build clang-13 lld-13
     - name: Configure
       run: >
         RTLD_NAME=${{ matrix.rtld }}
diff --git a/README.md b/README.md
index 61a7a8c..96c6311 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Comprehensive details about snmalloc's design can be found in the
 current implementation are [described here](difference.md).
 Since writing the paper, the performance of snmalloc has improved considerably.
 
-[![snmalloc CI](https://github.com/microsoft/snmalloc/actions/workflows/main.yml/badge.svg)](https://github.com/microsoft/snmalloc/actions/workflows/main.yml)
+[![snmalloc CI](https://github.com/microsoft/snmalloc/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/microsoft/snmalloc/actions/workflows/main.yml)
 
 # Further documentation