cl.exe (attempt 2)
#1337
Since the https://github.com/mstorsjo/msvc-wine/commit/2146cbfaf037e21de56c7157ec40bb6372860f51, the msvc-wine effectively initializes the WINE prefix when running the install.sh script. See install.sh#L143:
0 WINEDEBUG=-all wine64 wineboot &>/dev/null
Our following wine64 wineboot --init just messes up with the prefix.
This PR fixes this issue.
Also #1327 has been reverted as apparently it does not work. And #1320 has been combined into this one.
This reverts commit 27504d5c941df89bc828067248270179c9dcb04b.
Given this error message (see https://cirrus-ci.com/task/4836636333178880?logs=test#L7)
0wineserver: chdir to /tmp/wineprefix: No such file or directory
I assume, the problem is rather that /tmp is not persistent in Docker on Cirrus CI. So the Docker build creates a new wineprefix in /tmp/wineprefix, but it’s not persistent, so when CI runs on docker, the directory is gone already.
When I run WINEPREFIX=/tmp/wineprefix wineserver -p locally without having created this directory, it fails with the same error message. So maybe a proper solution is to move WINEPREFIX to some other directory than the default ~/wine, but not on /tmp. (Or recreate the wineprefix in every CI run, but that’s slower.)
To work around the current issue and to prevent similar issues in the future, this PR introduces the CI_MSVC_WINE_COMMIT Docker argument that binds to the known working commit in the mstorsjo/msvc-wine repo.
I think we should avoid pinning unless it’s really really necessary. We want to get MSVC updates.
I’ll post a real fix in a second :)
/var/lib/wine for example?
Reworked.
I think we should avoid pinning unless it’s really really necessary. We want to get MSVC updates.
Done.
Reworked.
Ok, let’s see if this does the job. :)
39+# msvc-wine effectively initializes the wine prefix when running
40+# the install.sh script. Wait until the wineserver process has
41 # exited before closing the session, to avoid corrupting the wine prefix.
42-RUN wine64 wineboot --init && \
43+RUN msvc-wine/install.sh /opt/msvc && \
44 while (ps -A | grep wineserver) > /dev/null; do sleep 1; done
Nit: maybe this should be merged with the RUN command above.
(but let’s first see if it works at all :) nice catch!)
edit: This is my suggestion
0 mkdir /opt/msvc && \
1 python3 msvc-wine/vsdownload.py --accept-license --dest /opt/msvc Microsoft.VisualStudio.Workload.VCTools && \
2# Since commit 2146cbfaf037e21de56c7157ec40bb6372860f51, the
3# msvc-wine effectively initializes the wine prefix when running
4# the install.sh script.
5 msvc-wine/install.sh /opt/msvc && \
6# Wait until the wineserver process has exited before closing the session,
7# to avoid corrupting the wine prefix.
8 while (ps -A | grep wineserver) > /dev/null; do sleep 1; done
The underlying issue is now worked around in upstream, see
https://github.com/mstorsjo/msvc-wine/issues/47 for details.