Fix tests: reset pacman.conf, correct CachyOS mirror URL format
Tests / tests (push) Failing after 2m43s
Tests / tests (push) Failing after 2m43s
This commit is contained in:
+28
-10
@@ -12,22 +12,45 @@ jobs:
|
|||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Install prerequisites
|
- name: Reset pacman.conf to stock
|
||||||
run: |
|
run: |
|
||||||
pacman -Syu --noconfirm --needed shellcheck yamllint
|
cat > /etc/pacman.conf << 'STOCKCONF'
|
||||||
|
[options]
|
||||||
|
DisableSandbox
|
||||||
|
HoldPkg = pacman glibc
|
||||||
|
Architecture = auto
|
||||||
|
CheckSpace
|
||||||
|
ParallelDownloads = 5
|
||||||
|
SigLevel = Required DatabaseOptional
|
||||||
|
LocalFileSigLevel = Optional
|
||||||
|
|
||||||
|
[core]
|
||||||
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
[extra]
|
||||||
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
STOCKCONF
|
||||||
|
sed -i 's/^ //' /etc/pacman.conf
|
||||||
|
|
||||||
|
# Remove stale sync databases for custom repos
|
||||||
|
rm -f /var/lib/pacman/sync/cachyos* /var/lib/pacman/sync/chaotic*
|
||||||
|
|
||||||
|
- name: Install prerequisites
|
||||||
|
run: pacman -Syu --noconfirm --needed shellcheck yamllint
|
||||||
|
|
||||||
- name: Set up CachyOS repo
|
- name: Set up CachyOS repo
|
||||||
run: |
|
run: |
|
||||||
# Import CachyOS key
|
|
||||||
pacman-key --recv-keys F3B607488DB35A47 --keyserver keyserver.ubuntu.com
|
pacman-key --recv-keys F3B607488DB35A47 --keyserver keyserver.ubuntu.com
|
||||||
pacman-key --lsign-key F3B607488DB35A47
|
pacman-key --lsign-key F3B607488DB35A47
|
||||||
|
|
||||||
# Install keyring and mirrorlist packages
|
|
||||||
pacman -U --noconfirm \
|
pacman -U --noconfirm \
|
||||||
'https://mirror.cachyos.org/repo/x86_64/cachyos/cachyos-keyring-20240331-1-any.pkg.tar.zst' \
|
'https://mirror.cachyos.org/repo/x86_64/cachyos/cachyos-keyring-20240331-1-any.pkg.tar.zst' \
|
||||||
'https://mirror.cachyos.org/repo/x86_64/cachyos/cachyos-mirrorlist-27-1-any.pkg.tar.zst'
|
'https://mirror.cachyos.org/repo/x86_64/cachyos/cachyos-mirrorlist-27-1-any.pkg.tar.zst'
|
||||||
|
|
||||||
# Add CachyOS repo to pacman.conf
|
# Fix the mirrorlist URL (pacnew has wrong format)
|
||||||
|
printf '%s\n' 'Server = https://mirror.cachyos.org/repo/$arch/$repo' \
|
||||||
|
> /etc/pacman.d/cachyos-mirrorlist
|
||||||
|
|
||||||
printf '\n[cachyos]\nInclude = /etc/pacman.d/cachyos-mirrorlist\n' \
|
printf '\n[cachyos]\nInclude = /etc/pacman.d/cachyos-mirrorlist\n' \
|
||||||
>> /etc/pacman.conf
|
>> /etc/pacman.conf
|
||||||
|
|
||||||
@@ -35,11 +58,6 @@ jobs:
|
|||||||
|
|
||||||
- name: Set up chaotic-aur repo
|
- name: Set up chaotic-aur repo
|
||||||
run: |
|
run: |
|
||||||
# Import chaotic-aur key
|
|
||||||
pacman-key --recv-keys 3056513887B78A2F --keyserver keyserver.ubuntu.com
|
|
||||||
pacman-key --lsign-key 3056513887B78A2F
|
|
||||||
|
|
||||||
# Install keyring and mirrorlist packages
|
|
||||||
pacman -U --noconfirm \
|
pacman -U --noconfirm \
|
||||||
'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' \
|
'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' \
|
||||||
'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
|
'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
|
||||||
|
|||||||
Reference in New Issue
Block a user