From 3f0b912a8009b127a7446120cfbcdc2ff8aeed7f Mon Sep 17 00:00:00 2001
From: Elliot Gorokhovsky <embg@fb.com>
Date: Fri, 2 Dec 2022 12:39:06 -0500
Subject: [PATCH] Fix gcc-7 and gcc-8 CI breakages

---
 .github/workflows/dev-long-tests.yml  | 4 ++++
 .github/workflows/dev-short-tests.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/dev-long-tests.yml b/.github/workflows/dev-long-tests.yml
index aadc0ab54..ac34c7165 100644
--- a/.github/workflows/dev-long-tests.yml
+++ b/.github/workflows/dev-long-tests.yml
@@ -71,7 +71,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: gcc-8 + ASan + UBSan + Test Zstd
+      # See https://askubuntu.com/a/1428822
       run: |
+        echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
         sudo apt-get -qqq update
         make gcc8install
         CC=gcc-8 make -j uasan-test-zstd </dev/null V=1
@@ -102,7 +104,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: gcc-8 + ASan + UBSan + Fuzz Test
+      # See https://askubuntu.com/a/1428822
       run: |
+        echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
         sudo apt-get -qqq update
         make gcc8install
         CC=gcc-8 FUZZER_FLAGS="--long-tests" make clean uasan-fuzztest
diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml
index 37186b5c9..acf3e4119 100644
--- a/.github/workflows/dev-short-tests.yml
+++ b/.github/workflows/dev-short-tests.yml
@@ -52,7 +52,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: gcc-7 + libzstdmt compilation
+      # See https://askubuntu.com/a/1428822
       run: |
+        echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
         sudo apt-get -qqq update
         make gcc7install
         CC=gcc-7 CFLAGS=-Werror make -j all
@@ -158,7 +160,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: gcc-8 build
+        # See https://askubuntu.com/a/1428822
         run: |
+          echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
           sudo apt-get -qqq update
           make gcc8install
           CC=gcc-8 CFLAGS="-Werror" make -j all
-- 
2.47.2