Fix check-packages: use docker run for Arch instead of container directive
Syntax Check / syntax-check (push) Failing after 27s
Syntax Check / syntax-check (push) Failing after 27s
This commit is contained in:
+111
-108
@@ -11,123 +11,126 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
check-packages:
|
check-packages:
|
||||||
runs-on: archlinux
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Install prerequisites
|
|
||||||
run: |
|
|
||||||
pacman -Syu --noconfirm --needed pacman pacman-contrib curl gnupg
|
|
||||||
|
|
||||||
- name: Set up official repos (extra, multilib)
|
|
||||||
run: |
|
|
||||||
printf '%s\n' \
|
|
||||||
'[options]' \
|
|
||||||
'Architecture = auto' \
|
|
||||||
'SigLevel = Required DatabaseOptional' \
|
|
||||||
'LocalFileSigLevel = Optional' \
|
|
||||||
'' \
|
|
||||||
'[core]' \
|
|
||||||
'Include = /etc/pacman.d/mirrorlist' \
|
|
||||||
'' \
|
|
||||||
'[extra]' \
|
|
||||||
'Include = /etc/pacman.d/mirrorlist' \
|
|
||||||
'' \
|
|
||||||
'[multilib]' \
|
|
||||||
'Include = /etc/pacman.d/mirrorlist' \
|
|
||||||
> /etc/pacman.conf
|
|
||||||
|
|
||||||
# Generate a basic mirrorlist
|
|
||||||
curl -fsSL "https://archlinux.org/mirrorlist/all/status/" \
|
|
||||||
| sed 's/^#Server/Server/' | head -20 > /etc/pacman.d/mirrorlist
|
|
||||||
|
|
||||||
pacman -Syu --noconfirm
|
|
||||||
|
|
||||||
- name: Set up CachyOS repo
|
|
||||||
run: |
|
|
||||||
# Import CachyOS keyring
|
|
||||||
curl -fsSL https://mirror.cachyos.org/cachyos-keyring.pkg.tar.zst \
|
|
||||||
-o /tmp/cachyos-keyring.pkg.tar.zst
|
|
||||||
pacman -U --noconfirm /tmp/cachyos-keyring.pkg.tar.zst || true
|
|
||||||
|
|
||||||
# Add CachyOS mirrorlist
|
|
||||||
printf '%s\n' \
|
|
||||||
'Server = https://mirror.cachyos.org/$repo/$arch' \
|
|
||||||
> /etc/pacman.d/cachyos-mirrorlist
|
|
||||||
|
|
||||||
# Add CachyOS repo to pacman.conf
|
|
||||||
printf '\n[cachyos]\nSigLevel = Optional TrustAll\nInclude = /etc/pacman.d/cachyos-mirrorlist\n' \
|
|
||||||
>> /etc/pacman.conf
|
|
||||||
|
|
||||||
pacman -Syu --noconfirm
|
|
||||||
|
|
||||||
- name: Set up chaotic-aur repo
|
|
||||||
run: |
|
|
||||||
# Import chaotic-aur keyring
|
|
||||||
pacman-key --recv-key FBA220DFC880C036 --keyserver keyserver.ubuntu.com
|
|
||||||
pacman-key --lsign-key FBA220DFC880C036 || true
|
|
||||||
|
|
||||||
# Add chaotic-aur mirrorlist
|
|
||||||
printf '%s\n' \
|
|
||||||
'Server = https://chaotic.archlinux.org/$repo/$arch' \
|
|
||||||
> /etc/pacman.d/chaotic-mirrorlist
|
|
||||||
|
|
||||||
# Add chaotic-aur repo to pacman.conf
|
|
||||||
printf '\n[chaotic-aur]\nSigLevel = Optional TrustAll\nInclude = /etc/pacman.d/chaotic-mirrorlist\n' \
|
|
||||||
>> /etc/pacman.conf
|
|
||||||
|
|
||||||
pacman -Syu --noconfirm
|
|
||||||
|
|
||||||
- name: Check all packages
|
- name: Check all packages
|
||||||
run: |
|
run: |
|
||||||
echo "═══════════════════════════════════════════════════════════════"
|
docker run --rm \
|
||||||
echo " Checking packages.x86_64 against repos"
|
-v "${{ github.workspace }}:/workspace" \
|
||||||
echo " Allowed repos: cachyos, extra, multilib, chaotic-aur"
|
-w /workspace \
|
||||||
echo "═══════════════════════════════════════════════════════════════"
|
archlinux:latest \
|
||||||
|
bash -c '
|
||||||
|
set -e
|
||||||
|
|
||||||
ALLOWED_REPOS="^(cachyos|extra|multilib|chaotic-aur)$"
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
MISSING=()
|
echo " Installing prerequisites"
|
||||||
FOUND=0
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
TOTAL=0
|
pacman -Syu --noconfirm --needed pacman pacman-contrib curl gnupg
|
||||||
|
|
||||||
while IFS= read -r pkg; do
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
# Skip empty lines and comments
|
echo " Setting up official repos (extra, multilib)"
|
||||||
[[ -z "$pkg" || "$pkg" =~ ^# ]] && continue
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
TOTAL=$((TOTAL + 1))
|
printf "%s\n" \
|
||||||
|
"[options]" \
|
||||||
|
"Architecture = auto" \
|
||||||
|
"SigLevel = Required DatabaseOptional" \
|
||||||
|
"LocalFileSigLevel = Optional" \
|
||||||
|
"" \
|
||||||
|
"[core]" \
|
||||||
|
"Include = /etc/pacman.d/mirrorlist" \
|
||||||
|
"" \
|
||||||
|
"[extra]" \
|
||||||
|
"Include = /etc/pacman.d/mirrorlist" \
|
||||||
|
"" \
|
||||||
|
"[multilib]" \
|
||||||
|
"Include = /etc/pacman.d/mirrorlist" \
|
||||||
|
> /etc/pacman.conf
|
||||||
|
|
||||||
# Query pacman for the package's repository
|
curl -fsSL "https://archlinux.org/mirrorlist/all/status/" \
|
||||||
repo=$(pacman -Si "$pkg" 2>/dev/null | grep "^Repository" | awk '{print $3}')
|
| sed "s/^#Server/Server/" | head -20 > /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
if [[ -z "$repo" ]]; then
|
pacman -Syu --noconfirm
|
||||||
echo "❌ MISSING: $pkg"
|
|
||||||
MISSING+=("$pkg")
|
|
||||||
elif [[ "$repo" =~ $ALLOWED_REPOS ]]; then
|
|
||||||
FOUND=$((FOUND + 1))
|
|
||||||
else
|
|
||||||
echo "⚠️ WRONG REPO: $pkg (found in: $repo)"
|
|
||||||
MISSING+=("$pkg")
|
|
||||||
fi
|
|
||||||
done < packages.x86_64
|
|
||||||
|
|
||||||
echo ""
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
echo "═══════════════════════════════════════════════════════════════"
|
echo " Setting up CachyOS repo"
|
||||||
echo " Results: $FOUND / $TOTAL packages found in allowed repos"
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
echo "═══════════════════════════════════════════════════════════════"
|
curl -fsSL https://mirror.cachyos.org/cachyos-keyring.pkg.tar.zst \
|
||||||
|
-o /tmp/cachyos-keyring.pkg.tar.zst
|
||||||
|
pacman -U --noconfirm /tmp/cachyos-keyring.pkg.tar.zst || true
|
||||||
|
|
||||||
if [[ ${#MISSING[@]} -gt 0 ]]; then
|
printf "%s\n" \
|
||||||
echo ""
|
"Server = https://mirror.cachyos.org/\$repo/\$arch" \
|
||||||
echo "⚠️ ${#MISSING[@]} package(s) NOT in allowed repos:"
|
> /etc/pacman.d/cachyos-mirrorlist
|
||||||
for p in "${MISSING[@]}"; do
|
|
||||||
echo " • $p"
|
printf "\n[cachyos]\nSigLevel = Optional TrustAll\nInclude = /etc/pacman.d/cachyos-mirrorlist\n" \
|
||||||
done
|
>> /etc/pacman.conf
|
||||||
echo ""
|
|
||||||
echo "These packages must be in:"
|
pacman -Syu --noconfirm
|
||||||
echo " • cachyos, extra, multilib, or chaotic-aur"
|
|
||||||
echo " • OR pre-built in localrepo/"
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
echo " • OR added to build-end4-deps.sh"
|
echo " Setting up chaotic-aur repo"
|
||||||
exit 1
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
else
|
pacman-key --recv-key FBA220DFC880C036 --keyserver keyserver.ubuntu.com
|
||||||
echo ""
|
pacman-key --lsign-key FBA220DFC880C036 || true
|
||||||
echo "✅ All packages verified successfully!"
|
|
||||||
fi
|
printf "%s\n" \
|
||||||
|
"Server = https://chaotic.archlinux.org/\$repo/\$arch" \
|
||||||
|
> /etc/pacman.d/chaotic-mirrorlist
|
||||||
|
|
||||||
|
printf "\n[chaotic-aur]\nSigLevel = Optional TrustAll\nInclude = /etc/pacman.d/chaotic-mirrorlist\n" \
|
||||||
|
>> /etc/pacman.conf
|
||||||
|
|
||||||
|
pacman -Syu --noconfirm
|
||||||
|
|
||||||
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
|
echo " Checking packages.x86_64 against repos"
|
||||||
|
echo " Allowed repos: cachyos, extra, multilib, chaotic-aur"
|
||||||
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
|
|
||||||
|
ALLOWED_REPOS="^(cachyos|extra|multilib|chaotic-aur)$"
|
||||||
|
MISSING=()
|
||||||
|
FOUND=0
|
||||||
|
TOTAL=0
|
||||||
|
|
||||||
|
while IFS= read -r pkg; do
|
||||||
|
[[ -z "$pkg" || "$pkg" =~ ^# ]] && continue
|
||||||
|
TOTAL=$((TOTAL + 1))
|
||||||
|
|
||||||
|
repo=$(pacman -Si "$pkg" 2>/dev/null | grep "^Repository" | awk "{print \$3}")
|
||||||
|
|
||||||
|
if [[ -z "$repo" ]]; then
|
||||||
|
echo "❌ MISSING: $pkg"
|
||||||
|
MISSING+=("$pkg")
|
||||||
|
elif [[ "$repo" =~ $ALLOWED_REPOS ]]; then
|
||||||
|
FOUND=$((FOUND + 1))
|
||||||
|
else
|
||||||
|
echo "⚠️ WRONG REPO: $pkg (found in: $repo)"
|
||||||
|
MISSING+=("$pkg")
|
||||||
|
fi
|
||||||
|
done < packages.x86_64
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
|
echo " Results: $FOUND / $TOTAL packages found in allowed repos"
|
||||||
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
|
|
||||||
|
if [[ ${#MISSING[@]} -gt 0 ]]; then
|
||||||
|
echo ""
|
||||||
|
echo "⚠️ ${#MISSING[@]} package(s) NOT in allowed repos:"
|
||||||
|
for p in "${MISSING[@]}"; do
|
||||||
|
echo " • $p"
|
||||||
|
done
|
||||||
|
echo ""
|
||||||
|
echo "These packages must be in:"
|
||||||
|
echo " • cachyos, extra, multilib, or chaotic-aur"
|
||||||
|
echo " • OR pre-built in localrepo/"
|
||||||
|
echo " • OR added to build-end4-deps.sh"
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
echo ""
|
||||||
|
echo "✅ All packages verified successfully!"
|
||||||
|
fi
|
||||||
|
'
|
||||||
|
|||||||
Reference in New Issue
Block a user