From 862732847101ce18a9a464291b26d6bfa91584e2 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Tue, 26 Nov 2024 06:41:23 +0000 Subject: [PATCH] PS4 workflow: Use pacman-package-manager Switches from `pacbrew-pacman` to vanilla pacman that is now an Ubuntu package (`pacman-package-manager`) starting from Ubuntu 24.04. pacbrew-pacman from https://github.com/PacBrew/pacbrew-pacman/releases is 2 years old and has the repo URL that no longer works. With the vanilla pacman, we simply add pacbrew as a repo source with the correct URL. Refs https://github.com/PacBrew/pacbrew-packages/issues/6#issuecomment-2499831033 --- .github/workflows/nightly.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e744a87b163..9fb97a19edf 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -706,7 +706,7 @@ jobs: - name: hellfire+patch cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -DUSE_PATCH=ON -DHELLFIRE=ON' artifact: 'hellfire-nightly-ps4p.pkg' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -714,12 +714,18 @@ jobs: fetch-depth: 0 - name: Create Build Environment - run: > - sudo apt-get update && - sudo apt-get install -y wget cmake git gettext && - wget https://github.com/PacBrew/pacbrew-pacman/releases/download/v1.1/pacbrew-pacman-1.1.deb && - sudo dpkg -i pacbrew-pacman-1.1.deb && sudo pacbrew-pacman -Sy && - sudo pacbrew-pacman --noconfirm -S ps4-openorbis ps4-openorbis-portlibs && + run: | + sudo apt-get update && \ + sudo apt-get install -y pacman-package-manager wget cmake git gettext && \ + sudo tee -a /etc/pacman.conf > /dev/null <" | sudo tee /opt/pacbrew/ps4/openorbis/include/sys/endian.h - name: Build