Merge #956

956: Use Wine from Ubuntu 20.04 WineHQ repo r=Alexhuszagh a=Jules-Bertholet



Co-authored-by: Jules Bertholet <julesbertholet@quoi.xyz>

Author: bors[bot]

.changes/956.json

@@ -0,0 +1,5 @@
+{
+  "description": "use Wine from Ubuntu 20.04 WineHQ repo",
+  "type": "changed",
+  "breaking": false
+}

docker/wine.sh

@@ -15,11 +15,11 @@ main() {
     # hardcode version, since we might want to avoid a version later.
     wget -nc https://dl.winehq.org/wine-builds/winehq.key
     mv winehq.key /usr/share/keyrings/winehq-archive.key
-    wget -nc https://dl.winehq.org/wine-builds/ubuntu/dists/bionic/winehq-bionic.sources
-    mv winehq-bionic.sources /etc/apt/sources.list.d/
+    wget -nc https://dl.winehq.org/wine-builds/ubuntu/dists/focal/winehq-focal.sources
+    mv winehq-focal.sources /etc/apt/sources.list.d/
     apt-get update
     apt install --no-install-recommends --assume-yes \
-        "winehq-stable=7.0.0.0~bionic-1"
+        "winehq-stable=7.0.0.0~focal-1"
 
     purge_packages
 }