From 22ea970bebd60e43162fafac87d206f75f61fdbc Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Sun, 14 Aug 2022 13:34:53 -0700 Subject: [PATCH] CI: uncomment clangarm64 from pacman.conf. instead of adding from scratch. Once the commented-out section was added, the grep would match that and no longer run the sed to add it. Also remove line adding clang32 section because that was added to default pacman.conf (and was thus a no-op). --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f952ea..81b63a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,8 +135,7 @@ jobs: run: | echo 'Server = https://repo.msys2.org/mingw/$repo/' > /etc/pacman.d/mirrorlist.mingw echo 'Server = https://repo.msys2.org/msys/$arch/' > /etc/pacman.d/mirrorlist.msys - grep -qF '[clang32]' /etc/pacman.conf || sed -i '1s|^|[clang32]\nServer = http://repo.msys2.org/mingw/clang32/\n|' /etc/pacman.conf - grep -qF '[clangarm64]' /etc/pacman.conf || sed -i '1s|^|[clangarm64]\nServer = http://repo.msys2.org/mingw/clangarm64/\n|' /etc/pacman.conf + grep -qFx '[clangarm64]' /etc/pacman.conf || sed -i '/^# \[clangarm64\]/,/^$/ s|^# ||g' /etc/pacman.conf pacman-conf.exe - name: Update using the main mirror & Check install