rework and re enable wine v8 builds drop proton-ge build

.github/workflows/main.yml

@@ -4,15 +4,12 @@ name: CI
 
 # Controls when the action will run. 
 on:
-  # Build at 00:00 on every 12th day-of-month.
-  schedule:
-    - cron: "0 0 */12 * *"
-  # Triggers the workflow on push or pull request events but only for the master branch
+  # Triggers the workflow on push or pull request events but only for the old-v8 branch
   push:
-    branches: [ master ]
+    branches: [ old-v8 ]
     paths-ignore: [ '**/README.md' ]
   pull_request:
-    branches: [ master ]
+    branches: [ old-v8 ]
     paths-ignore: [ '**/README.md' ]
 
   # Allows you to run this workflow manually from the Actions tab
@@ -36,7 +33,8 @@ jobs:
           wget -q "https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.0.3/appimage-builder-1.0.3-x86_64.AppImage" -O appimage-builder ; chmod +x appimage-builder ; ./appimage-builder --appimage-extract &>/dev/null
           mkdir -p /usr/share/icons/hicolor/scalable/ ; cp wine.svg /usr/share/icons/hicolor/scalable/
           # stable
-          echo "WINE_VER=stable_$(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-stable | sed 's|_| |g;s|~| |g' | awk '{print $5}' | tail -n1)" >> $GITHUB_ENV
+          # echo "WINE_VER=stable_$(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-stable | sed 's|_| |g;s|~| |g' | awk '{print $5}' | tail -n1)" >> $GITHUB_ENV
+          echo "WINE_VER=stable_8.0.2" >> $GITHUB_ENV
           # Nvidia
           # echo "NVDV=$(wget "https://launchpad.net/~graphics-drivers/+archive/ubuntu/ppa/+packages?field.name_filter=&field.status_filter=published&field.series_filter=kinetic" -qO- | grep -Eo drivers-.*changes | sed -r "s|_| |g;s|-| |g" | tail -n1 | awk '{print $9}')" >> $GITHUB_ENV
 
@@ -57,8 +55,8 @@ jobs:
       - name: release
         uses: marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303
         with:
-          title: Continuous build (stable)
-          automatic_release_tag: continuous-stable
+          title: build (stable) v8
+          automatic_release_tag: stable-v8
           prerelease: false
           draft: false
           files: /home/runner/work/WINE_AppImage/WINE_AppImage/*.AppImage*
@@ -106,8 +104,8 @@ jobs:
       - name: release
         uses: marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303
         with:
-          title: Continuous build (devel)
-          automatic_release_tag: continuous-devel
+          title: build (devel) v8
+          automatic_release_tag: devel-v8
           prerelease: false
           draft: false
           files: /home/runner/work/WINE_AppImage/WINE_AppImage/*.AppImage*
@@ -155,51 +153,8 @@ jobs:
       - name: release
         uses: marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303
         with:
-          title: Continuous build (staging)
-          automatic_release_tag: continuous-staging
-          prerelease: false
-          draft: false
-          files: /home/runner/work/WINE_AppImage/WINE_AppImage/*.AppImage*
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-
-  # This workflow contains a single job called "build-staging-ge-proton"
-  build-staging-ge-proton:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-
-      - name: Prerequisites
-        run: |
-          wget -q "https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.0.3/appimage-builder-1.0.3-x86_64.AppImage" -O appimage-builder ; chmod +x appimage-builder ; ./appimage-builder --appimage-extract &>/dev/null
-          mkdir -p /usr/share/icons/hicolor/scalable/ ; cp wine.svg /usr/share/icons/hicolor/scalable/
-          # staging
-          echo "WINE_VER=staging_ge-proton_$(wget -qO- "https://github.com/GloriousEggroll/wine-ge-custom/tags" | grep -Eo "GE-P.*" | head -1 | sed -r 's|-GE||g;s|"| |g;s|n| |g' | awk '{print $2}')" >> $GITHUB_ENV
-          # Nvidia
-          # echo "NVDV=$(wget "https://launchpad.net/~graphics-drivers/+archive/ubuntu/ppa/+packages?field.name_filter=&field.status_filter=published&field.series_filter=kinetic" -qO- | grep -Eo drivers-.*changes | sed -r "s|_| |g;s|-| |g" | tail -n1 | awk '{print $9}')" >> $GITHUB_ENV
-
-      # Runs a set of commands using the runners shell
-      - name: Build appimage
-        run: |
-          # add custom mksquashfs
-          cp runtime/mksquashfs squashfs-root/usr/bin/mksquashfs
-
-          # force zstd format in appimagebuilder for appimages
-          rm appimage-builder ; sed -i 's|xz|zstd|' squashfs-root/usr/lib/python3.8/site-packages/appimagebuilder/modules/prime/appimage_primer.py
-
-          # set Nvidia driver version
-          # sed -i "s|520|$NVDV|" wine-staging-ge-proton.yml
-
-          squashfs-root/AppRun --recipe wine-staging-ge-proton.yml
-
-      - name: release
-        uses: marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303
-        with:
-          title: Continuous build (staging) GE Proton
-          automatic_release_tag: continuous-staging_ge_proton
+          title: build (staging) v8
+          automatic_release_tag: staging-v8
           prerelease: false
           draft: false
           files: /home/runner/work/WINE_AppImage/WINE_AppImage/*.AppImage*

wine-devel.yml

@@ -165,7 +165,7 @@ AppDir:
     # this is executed after the packages and files are added
     - |
      # Patch wrapper script
-     sed -i 's|wine-appimage|wine-appimage-devel|' AppDir/wrapper
+     sed -i 's|wine-appimage|wine-appimage-devel-v8|' AppDir/wrapper
 
      # Check for rc builds
      # if [ $(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-devel | tail -n1 | grep -c ~rc) -gt 0 ]; then
@@ -253,13 +253,13 @@ AppDir:
   runtime:
     env:
       LIBGL_DRIVERS_PATH: '${APPDIR}/usr/lib/i386-linux-gnu/dri:${APPDIR}/usr/lib/x86_64-linux-gnu/dri:${LIBGL_DRIVERS_PATH}'
-      APPDIR_LIBC_VERSION: '2.38'
+      APPDIR_LIBC_VERSION: '2.39'
 
     path_mappings:
     - /opt/wine-devel:$APPDIR/opt/wine-devel
 
 AppImage:
-  update-information: gh-releases-zsync|mmtrt|WINE_AppImage|continuous-devel|wine-devel*.AppImage.zsync
+  update-information: gh-releases-zsync|mmtrt|WINE_AppImage|devel-v8|wine-devel*.AppImage.zsync
   #sign-key: None
   arch: x86_64
 

wine-stable.yml

@@ -165,9 +165,12 @@ AppDir:
     # this is executed after the packages and files are added
     - |
      # Patch wrapper script
-     sed -i 's|wine-appimage|wine-appimage-stable|' AppDir/wrapper
+     sed -i 's|wine-appimage|wine-appimage-stable-v8|' AppDir/wrapper
+
+     # WINE_VER="$(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-stable | sed 's|_| |g;s|~| |g' | awk '{print $5}' | tail -n1)"
+
+     WINE_VER="8.0.2"
 
-     WINE_VER="$(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-stable | sed 's|_| |g;s|~| |g' | awk '{print $5}' | tail -n1)"
      wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-i386/wine-stable_${WINE_VER}~jammy-1_i386.deb
      wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-i386/wine-stable-i386_${WINE_VER}~jammy-1_i386.deb
      wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/wine-stable_${WINE_VER}~jammy-1_amd64.deb
@@ -189,9 +192,6 @@ AppDir:
      sed -i 's|    FileOpenAssociations|    FileOpenAssociations,\\\n    DllOverrides|;$a \\n[DllOverrides]\nHKCU,Software\\Wine\\DllOverrides,"*winemenubuilder.exe",,""' AppDir/opt/wine-stable/share/wine/wine.inf
      sed -i '/\%11\%\\winemenubuilder.exe -a -r/d' AppDir/opt/wine-stable/share/wine/wine.inf
 
-     # Pre patch setting wine blue theme by default
-     sed -i 's|    DllOverrides|    DllOverrides,\\\n    ThemeSet|;$a \\n[ThemeSet]\nHKCU,Software\\Microsoft\\Windows\\CurrentVersion\\ThemeManager,"ColorName",,"Blue"\nHKCU,Software\\Microsoft\\Windows\\CurrentVersion\\ThemeManager,"DllName",,"C:\\windows\\Resources\\Themes\\light\\light.msstyles"\nHKCU,Software\\Microsoft\\Windows\\CurrentVersion\\ThemeManager,"ThemeActive",,"1"' AppDir/opt/wine-stable/share/wine/wine.inf
-
      # Deploy wine-mono wine-gecko
      # For future reference setting of MONO_VER see https://github.com/wine-mirror/wine/tree/stable of wine-stable
      MONO_VER=$(wget "https://raw.githubusercontent.com/wine-mirror/wine/$(wget -qO- https://github.com/wine-mirror/wine/releases/tag/wine-${WINE_VER} | grep 'commit/' | sed -r 's|/wine-mirror/wine/commit/||g' | cut -d'"' -f2 | head -1)/dlls/appwiz.cpl/addons.c" -qO- | grep -Po 'MONO_VERSION.*[0-9]"' | cut -d'"' -f2)
@@ -244,13 +244,13 @@ AppDir:
   runtime:
     env:
       LIBGL_DRIVERS_PATH: '${APPDIR}/usr/lib/i386-linux-gnu/dri:${APPDIR}/usr/lib/x86_64-linux-gnu/dri:${LIBGL_DRIVERS_PATH}'
-      APPDIR_LIBC_VERSION: '2.38'
+      APPDIR_LIBC_VERSION: '2.39'
 
     path_mappings:
     - /opt/wine-stable:$APPDIR/opt/wine-stable
 
 AppImage:
-  update-information: gh-releases-zsync|mmtrt|WINE_AppImage|continuous-stable|wine-stable*.AppImage.zsync
+  update-information: gh-releases-zsync|mmtrt|WINE_AppImage|stable-v8|wine-stable*.AppImage.zsync
   #sign-key: None
   arch: x86_64
 

wine-staging.yml

@@ -165,7 +165,7 @@ AppDir:
     # this is executed after the packages and files are added
     - |
      # Patch wrapper script
-     sed -i 's|wine-appimage|wine-appimage-staging|' AppDir/wrapper
+     sed -i 's|wine-appimage|wine-appimage-staging-v8|' AppDir/wrapper
 
      # Check for rc builds
      # if [ $(wget -qO- https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-amd64/ | grep wine-staging | tail -n1 | grep -c ~rc) -gt 0 ]; then
@@ -253,13 +253,13 @@ AppDir:
   runtime:
     env:
       LIBGL_DRIVERS_PATH: '${APPDIR}/usr/lib/i386-linux-gnu/dri:${APPDIR}/usr/lib/x86_64-linux-gnu/dri:${LIBGL_DRIVERS_PATH}'
-      APPDIR_LIBC_VERSION: '2.38'
+      APPDIR_LIBC_VERSION: '2.39'
 
     path_mappings:
     - /opt/wine-staging:$APPDIR/opt/wine-staging
 
 AppImage:
-  update-information: gh-releases-zsync|mmtrt|WINE_AppImage|continuous-staging|wine-staging*.AppImage.zsync
+  update-information: gh-releases-zsync|mmtrt|WINE_AppImage|staging-v8|wine-staging*.AppImage.zsync
   #sign-key: None
   arch: x86_64