From e552724524d406ebd7d3d4435fca309203994afc Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Sun, 7 Mar 2021 17:14:48 -0500
Subject: [PATCH 1/2] disable glibc 2.33 workaround once github workflows are
 no longer broken

---
 .github/workflows/ci.yml           | 8 +-------
 .github/workflows/translations.yml | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1b8fd10099..ee78681edf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,14 +40,8 @@ jobs:
                 CI: 'true'
         steps:
             - name: Setup container
-              # WORKAROUND for glibc 2.33 and old Docker
-              # See https://github.com/actions/virtual-environments/issues/2658
-              # Thanks to https://github.com/lxqt/lxqt-panel/pull/1562
               run: |
-                patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst
-                curl -LO "https://repo.archlinuxcn.org/x86_64/$patched_glibc"
-                bsdtar -C / -xf "$patched_glibc"
-                pacman -Syu --noconfirm --ignore glibc
+                pacman -Syu --noconfirm
                 pacman -S --noconfirm tar
 
             - name: Checkout source code
diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
index 3bc026a8d5..c55be036aa 100644
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -15,14 +15,8 @@ jobs:
                 CI: 'true'
         steps:
             - name: Setup container
-              # WORKAROUND for glibc 2.33 and old Docker
-              # See https://github.com/actions/virtual-environments/issues/2658
-              # Thanks to https://github.com/lxqt/lxqt-panel/pull/1562
               run: |
-                patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst
-                curl -LO "https://repo.archlinuxcn.org/x86_64/$patched_glibc"
-                bsdtar -C / -xf "$patched_glibc"
-                pacman -Syu --noconfirm --ignore glibc
+                pacman -Syu --noconfirm
                 pacman -S --noconfirm tar
 
             - name: Checkout source code

From 68500c8b6497363304d6098ba036ed030ca34cc5 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Sun, 14 Feb 2021 10:56:24 -0500
Subject: [PATCH 2/2] use official image, not deprecated one

---
 .github/workflows/ci.yml           | 2 +-
 .github/workflows/translations.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee78681edf..5bbe2d3c9f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
         name: Test on Arch
         runs-on: ubuntu-latest
         container:
-            image: 'archlinux/base:latest'
+            image: 'archlinux/archlinux:latest'
             env:
                 CI: 'true'
         steps:
diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
index c55be036aa..294fc98434 100644
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -10,7 +10,7 @@ jobs:
         if: github.repository == 'kovidgoyal/calibre'
         runs-on: ubuntu-latest
         container:
-            image: 'archlinux/base:latest'
+            image: 'archlinux/archlinux:latest'
             env:
                 CI: 'true'
         steps: