Merge pull request #27 from rankynbass/wine-xiv-git/ubuntu-CI-fix

Fix Ubuntu CI by updating to ubuntu-22.04
goatcorp · Aug 31, 2024 · 37bdac8 · 37bdac8
2 parents eb28280 + 27e808a
commit 37bdac8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/wine-arch.yml b/.github/workflows/wine-arch.yml
@@ -19,7 +19,8 @@ jobs:
           chown user -R . && cd wine-tkg-git
           # Workaround for jack&jack2 conflict https://github.com/Frogging-Family/wine-tkg-git/issues/237
           sed -i "/'jack2'                 'lib32-jack2'/d" PKGBUILD
-          sed -i "/'gst-plugins-good'      'lib32-gst-plugins-good'/d" PKGBUILD 
+          sed -i "/'gst-plugins-good'      'lib32-gst-plugins-good'/d" PKGBUILD
+          sed -i 's/pkgname=wine-tkg/pkgname=wine-xiv/' PKGBUILD
           sed -i 's/wayland_driver="false"/wayland_driver="true"/' customization.cfg
           su user -c "yes|PKGDEST=/tmp/wine-tkg makepkg --noconfirm -s"
 

diff --git a/.github/workflows/wine-fedora.yml b/.github/workflows/wine-fedora.yml
@@ -14,8 +14,10 @@ jobs:
       - name: Compilation
         run: |
           sudo dnf -y -q upgrade --refresh
-          cd wine-tkg-git 
+          cd wine-tkg-git
+          sed -i 's/pkgname=wine-tkg/pkgname=wine-xiv/' non-makepkg-build.sh
           sed -i 's/distro=""/distro="fedora"/' customization.cfg
+          sed -i 's/_wayland_driver="false"/_wayland_driver="true"/' customization.cfg
           sed -i 's/_NOLIB32="false"/_NOLIB32="wow64"/' wine-tkg-profiles/advanced-customization.cfg
           echo '_ci_build="true"' >> customization.cfg
           touch tarplz

diff --git a/.github/workflows/wine-ubuntu.yml b/.github/workflows/wine-ubuntu.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
 
@@ -16,8 +16,11 @@ jobs:
           sudo dpkg --add-architecture i386 && sudo apt update
           sudo apt install aptitude
           sudo aptitude remove -y '?narrow(?installed,?version(deb.sury.org))'
-          cd wine-tkg-git 
+          sudo apt install libxkbregistry-dev
+          cd wine-tkg-git
+          sed -i 's/pkgname=wine-tkg/pkgname=wine-xiv/' non-makepkg-build.sh
           sed -i 's/distro=""/distro="debuntu"/' customization.cfg
+          sed -i 's/_wayland_driver="false"/_wayland_driver="true"/' customization.cfg
           sed -i 's/_NOLIB32="false"/_NOLIB32="wow64"/' wine-tkg-profiles/advanced-customization.cfg
           echo '_ci_build="true"' >> customization.cfg
           touch tarplz