Skip to content

Commit 411a05b

Browse files
mmtrtmmtrt
committed
rework and re enable wine v8 builds drop proton-ge build
1 parent 164e294 commit 411a05b

File tree

5 files changed

+24
-269
lines changed

5 files changed

+24
-269
lines changed

‎.github/workflows/main.yml

Lines changed: 11 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@ name: CI
44

55
# Controls when the action will run.
66
on:
7-
# Build at 00:00 on every 12th day-of-month.
8-
schedule:
9-
- cron: "0 0 */12 * *"
10-
# Triggers the workflow on push or pull request events but only for the master branch
7+
# Triggers the workflow on push or pull request events but only for the old-v8 branch
118
push:
12-
branches: [ master ]
9+
branches: [ old-v8 ]
1310
paths-ignore: [ '**/README.md' ]
1411
pull_request:
15-
branches: [ master ]
12+
branches: [ old-v8 ]
1613
paths-ignore: [ '**/README.md' ]
1714

1815
# Allows you to run this workflow manually from the Actions tab
@@ -36,7 +33,8 @@ jobs:
3633
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
3734
mkdir -p /usr/share/icons/hicolor/scalable/ ; cp wine.svg /usr/share/icons/hicolor/scalable/
3835
# stable
39-
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
36+
# 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
37+
echo "WINE_VER=stable_8.0.2" >> $GITHUB_ENV
4038
# Nvidia
4139
# 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
4240
@@ -57,8 +55,8 @@ jobs:
5755
- name: release
5856
uses: marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303
5957
with:
60-
title: Continuous build (stable)
61-
automatic_release_tag: continuous-stable
58+
title: build (stable) v8
59+
automatic_release_tag: stable-v8
6260
prerelease: false
6361
draft: false
6462
files: /home/runner/work/WINE_AppImage/WINE_AppImage/*.AppImage*
@@ -106,8 +104,8 @@ jobs:
106104
- name: release
107105
uses: marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303
108106
with:
109-
title: Continuous build (devel)
110-
automatic_release_tag: continuous-devel
107+
title: build (devel) v8
108+
automatic_release_tag: devel-v8
111109
prerelease: false
112110
draft: false
113111
files: /home/runner/work/WINE_AppImage/WINE_AppImage/*.AppImage*
@@ -155,51 +153,8 @@ jobs:
155153
- name: release
156154
uses: marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303
157155
with:
158-
title: Continuous build (staging)
159-
automatic_release_tag: continuous-staging
160-
prerelease: false
161-
draft: false
162-
files: /home/runner/work/WINE_AppImage/WINE_AppImage/*.AppImage*
163-
repo_token: ${{ secrets.GITHUB_TOKEN }}
164-
165-
# This workflow contains a single job called "build-staging-ge-proton"
166-
build-staging-ge-proton:
167-
# The type of runner that the job will run on
168-
runs-on: ubuntu-latest
169-
170-
# Steps represent a sequence of tasks that will be executed as part of the job
171-
steps:
172-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
173-
- uses: actions/checkout@v3
174-
175-
- name: Prerequisites
176-
run: |
177-
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
178-
mkdir -p /usr/share/icons/hicolor/scalable/ ; cp wine.svg /usr/share/icons/hicolor/scalable/
179-
# staging
180-
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
181-
# Nvidia
182-
# 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
183-
184-
# Runs a set of commands using the runners shell
185-
- name: Build appimage
186-
run: |
187-
# add custom mksquashfs
188-
cp runtime/mksquashfs squashfs-root/usr/bin/mksquashfs
189-
190-
# force zstd format in appimagebuilder for appimages
191-
rm appimage-builder ; sed -i 's|xz|zstd|' squashfs-root/usr/lib/python3.8/site-packages/appimagebuilder/modules/prime/appimage_primer.py
192-
193-
# set Nvidia driver version
194-
# sed -i "s|520|$NVDV|" wine-staging-ge-proton.yml
195-
196-
squashfs-root/AppRun --recipe wine-staging-ge-proton.yml
197-
198-
- name: release
199-
uses: marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303
200-
with:
201-
title: Continuous build (staging) GE Proton
202-
automatic_release_tag: continuous-staging_ge_proton
156+
title: build (staging) v8
157+
automatic_release_tag: staging-v8
203158
prerelease: false
204159
draft: false
205160
files: /home/runner/work/WINE_AppImage/WINE_AppImage/*.AppImage*

‎wine-devel.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ AppDir:
165165
# this is executed after the packages and files are added
166166
- |
167167
# Patch wrapper script
168-
sed -i 's|wine-appimage|wine-appimage-devel|' AppDir/wrapper
168+
sed -i 's|wine-appimage|wine-appimage-devel-v8|' AppDir/wrapper
169169
170170
# Check for rc builds
171171
# 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:
253253
runtime:
254254
env:
255255
LIBGL_DRIVERS_PATH: '${APPDIR}/usr/lib/i386-linux-gnu/dri:${APPDIR}/usr/lib/x86_64-linux-gnu/dri:${LIBGL_DRIVERS_PATH}'
256-
APPDIR_LIBC_VERSION: '2.38'
256+
APPDIR_LIBC_VERSION: '2.39'
257257

258258
path_mappings:
259259
- /opt/wine-devel:$APPDIR/opt/wine-devel
260260

261261
AppImage:
262-
update-information: gh-releases-zsync|mmtrt|WINE_AppImage|continuous-devel|wine-devel*.AppImage.zsync
262+
update-information: gh-releases-zsync|mmtrt|WINE_AppImage|devel-v8|wine-devel*.AppImage.zsync
263263
#sign-key: None
264264
arch: x86_64
265265

‎wine-stable.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,12 @@ AppDir:
165165
# this is executed after the packages and files are added
166166
- |
167167
# Patch wrapper script
168-
sed -i 's|wine-appimage|wine-appimage-stable|' AppDir/wrapper
168+
sed -i 's|wine-appimage|wine-appimage-stable-v8|' AppDir/wrapper
169+
170+
# 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)"
171+
172+
WINE_VER="8.0.2"
169173
170-
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)"
171174
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-i386/wine-stable_${WINE_VER}~jammy-1_i386.deb
172175
wget -q -c https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/main/binary-i386/wine-stable-i386_${WINE_VER}~jammy-1_i386.deb
173176
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:
189192
sed -i 's| FileOpenAssociations| FileOpenAssociations,\\\n DllOverrides|;$a \\n[DllOverrides]\nHKCU,Software\\Wine\\DllOverrides,"*winemenubuilder.exe",,""' AppDir/opt/wine-stable/share/wine/wine.inf
190193
sed -i '/\%11\%\\winemenubuilder.exe -a -r/d' AppDir/opt/wine-stable/share/wine/wine.inf
191194
192-
# Pre patch setting wine blue theme by default
193-
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
194-
195195
# Deploy wine-mono wine-gecko
196196
# For future reference setting of MONO_VER see https://github.com/wine-mirror/wine/tree/stable of wine-stable
197197
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:
244244
runtime:
245245
env:
246246
LIBGL_DRIVERS_PATH: '${APPDIR}/usr/lib/i386-linux-gnu/dri:${APPDIR}/usr/lib/x86_64-linux-gnu/dri:${LIBGL_DRIVERS_PATH}'
247-
APPDIR_LIBC_VERSION: '2.38'
247+
APPDIR_LIBC_VERSION: '2.39'
248248

249249
path_mappings:
250250
- /opt/wine-stable:$APPDIR/opt/wine-stable
251251

252252
AppImage:
253-
update-information: gh-releases-zsync|mmtrt|WINE_AppImage|continuous-stable|wine-stable*.AppImage.zsync
253+
update-information: gh-releases-zsync|mmtrt|WINE_AppImage|stable-v8|wine-stable*.AppImage.zsync
254254
#sign-key: None
255255
arch: x86_64
256256

‎wine-staging-ge-proton.yml

Lines changed: 0 additions & 200 deletions
This file was deleted.

‎wine-staging.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ AppDir:
165165
# this is executed after the packages and files are added
166166
- |
167167
# Patch wrapper script
168-
sed -i 's|wine-appimage|wine-appimage-staging|' AppDir/wrapper
168+
sed -i 's|wine-appimage|wine-appimage-staging-v8|' AppDir/wrapper
169169
170170
# Check for rc builds
171171
# 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:
253253
runtime:
254254
env:
255255
LIBGL_DRIVERS_PATH: '${APPDIR}/usr/lib/i386-linux-gnu/dri:${APPDIR}/usr/lib/x86_64-linux-gnu/dri:${LIBGL_DRIVERS_PATH}'
256-
APPDIR_LIBC_VERSION: '2.38'
256+
APPDIR_LIBC_VERSION: '2.39'
257257

258258
path_mappings:
259259
- /opt/wine-staging:$APPDIR/opt/wine-staging
260260

261261
AppImage:
262-
update-information: gh-releases-zsync|mmtrt|WINE_AppImage|continuous-staging|wine-staging*.AppImage.zsync
262+
update-information: gh-releases-zsync|mmtrt|WINE_AppImage|staging-v8|wine-staging*.AppImage.zsync
263263
#sign-key: None
264264
arch: x86_64
265265

0 commit comments

Comments
 (0)