fix: aur builds

This commit is contained in:
Ryan Dowling 2022-02-24 19:02:44 +11:00
parent 142420df61
commit 182d20fc4f
No known key found for this signature in database
GPG key ID: 5539FCDB88950EFD
2 changed files with 2 additions and 8 deletions

View file

@ -3,15 +3,9 @@ FROM archlinux:latest
# makepkg cannot (and should not) be run as root:
RUN useradd -m notroot
# https://github.com/actions/virtual-environments/issues/2658
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 / -xvf "$patched_glibc" && \
echo "IgnorePkg = glibc" >> /etc/pacman.conf
# Generally, refreshing without sync'ing is discouraged, but we've a clean
# environment here.
RUN pacman -Sy --noconfirm archlinux-keyring openssh base-devel git pacman-contrib namcap && \
RUN pacman -Sy --noconfirm archlinux-keyring openssh base-devel git pacman-contrib namcap glibc && \
pacman -Syu --noconfirm
# Allow notroot to run stuff as root (to install dependencies):

2
.vscode/launch.json vendored
View file

@ -9,7 +9,7 @@
"projectName": "ATLauncher",
"cwd": "${workspaceFolder}/testLauncher",
"preLaunchTask": "createTestLauncherDir",
"args": "--debug --debug-level 5 --disable-error-reporting --no-launcher-update",
"args": "--debug --debug-level 5 --disable-error-reporting --no-launcher-update --config-override {\"platforms\":{\"modrinth\":{\"modpacksEnabled\":true}}}",
},
{
"type": "java",