Skip to content

Commit 1a9d6c8

Browse files
committed
go
1 parent 1c1061c commit 1a9d6c8

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
run: |
8282
${{matrix.arch == 'i686' && 'sudo' || ''}} dpkg --add-architecture ${{steps.debian.outputs.arch}}
8383
${{matrix.arch == 'i686' && 'sudo' || ''}} apt update -y
84-
${{matrix.arch == 'i686' && 'sudo' || ''}} apt install -y file git pacman-package-manager wget make cmake unzip python3-jinja2 zenity libopenal-dev:${{steps.debian.outputs.arch}} libx11-dev:${{steps.debian.outputs.arch}} libxrandr-dev:${{steps.debian.outputs.arch}} libxinerama-dev:${{steps.debian.outputs.arch}} libxcursor-dev:${{steps.debian.outputs.arch}} libxi-dev:${{steps.debian.outputs.arch}} libgl-dev:${{steps.debian.outputs.arch}} libwayland-dev:${{steps.debian.outputs.arch}} libpulse-dev:${{steps.debian.outputs.arch}} libxkbcommon-dev:${{steps.debian.outputs.arch}} libegl-dev:${{steps.debian.outputs.arch}}
84+
${{matrix.arch == 'i686' && 'sudo' || ''}} apt install -y gnupg archlinux-keyring file git pacman-package-manager wget make cmake unzip python3-jinja2 zenity libopenal-dev:${{steps.debian.outputs.arch}} libx11-dev:${{steps.debian.outputs.arch}} libxrandr-dev:${{steps.debian.outputs.arch}} libxinerama-dev:${{steps.debian.outputs.arch}} libxcursor-dev:${{steps.debian.outputs.arch}} libxi-dev:${{steps.debian.outputs.arch}} libgl-dev:${{steps.debian.outputs.arch}} libwayland-dev:${{steps.debian.outputs.arch}} libpulse-dev:${{steps.debian.outputs.arch}} libxkbcommon-dev:${{steps.debian.outputs.arch}} libegl-dev:${{steps.debian.outputs.arch}}
8585
8686
- name: Install GCC-Multilib
8787
if: ${{matrix.target == 'ubuntu-latest' && matrix.arch == 'i686'}}
@@ -172,6 +172,7 @@ jobs:
172172
- name: Build Arch pkg
173173
if: ${{matrix.target == 'ubuntu-latest' }}
174174
run: |
175+
${{matrix.arch == 'i686' && 'sudo' || ''}} sh ./pkgs/setup-pacman.sh
175176
cp build-${{matrix.arch}}/ninecraft/ninecraft pkgs/arch
176177
cd pkgs/arch
177178
${{matrix.arch == 'i686' && 'sudo' || ''}} pacman -Syy

pkgs/setup-pacman.sh

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/bash
2+
set -euxo pipefail
3+
4+
# 1. Ensure pacman dirs exist
5+
mkdir -p /etc/pacman.d /var/lib/pacman /var/cache/pacman/pkg
6+
7+
# 2. Create a minimal pacman.conf
8+
tee /etc/pacman.conf > /dev/null <<EOF
9+
[options]
10+
Architecture = auto
11+
SigLevel = Required DatabaseOptional
12+
LocalFileSigLevel = Optional
13+
CheckSpace
14+
15+
[core]
16+
Server = https://mirror.rackspace.com/archlinux/\$repo/os/\$arch
17+
18+
[extra]
19+
Server = https://mirror.rackspace.com/archlinux/\$repo/os/\$arch
20+
21+
[community]
22+
Server = https://mirror.rackspace.com/archlinux/\$repo/os/\$arch
23+
EOF
24+
25+
# 3. Initialize and populate keyring (force reinstall in case of damage)
26+
pacman-key --init
27+
pacman-key --populate archlinux || true
28+
pacman -Sy --noconfirm archlinux-keyring || true
29+
30+
# 4. Sync the pacman database
31+
pacman -Syy --noconfirm
32+
33+
# 5. Optional: install test packages
34+
pacman -S --noconfirm git base-devel

0 commit comments

Comments
 (0)