ci: Remove quirk that runs dummy command after wineserver #1320
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Maybe rebase on top of the #1326? |
The underlying issue is now worked around in upstream, see mstorsjo/msvc-wine#47 for details.
real-or-random
force-pushed
the
202305-wineserver-workaround
branch
from
3f67571
to
cb9056b
Compare
|
rebased on master |
This was referenced Jun 2, 2023
|
I took liberty to combine this PR into #1337. |
|
Let me manually retrigger CI here. I could imagine Cirrus is confused and still uses the old image here for some reason. |
Ok, that didn't help. |
|
Closing in favor of #1337. |
real-or-random
added a commit
that referenced
this pull request
Jun 3, 2023
db29bf2 ci: Remove quirk that runs dummy command after wineserver (Tim Ruffing) c7db494 ci: Fix error D8037 in `cl.exe` (Hennadii Stepanov) 7dae115 Revert "ci: Move wine prefix to /tmp to avoid error D8037 in cl.exe" (Hennadii Stepanov) Pull request description: Since the mstorsjo/msvc-wine@2146cbf, the `msvc-wine` effectively initializes the WINE prefix when running the `install.sh` script. See [`install.sh`#L143](https://github.com/mstorsjo/msvc-wine/blob/2146cbfaf037e21de56c7157ec40bb6372860f51/install.sh#L143): ```sh 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. ACKs for top commit: real-or-random: ACK db29bf2 Tree-SHA512: 59e61bde0060f67501f93da8b4e193f2bfcda85d849c16bb017e38af7aa9e3b569fe2fd4aa5cdb658c3b2345cc42fad98323e329b519389b2e881ecfd403d147
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The underlying issue is now worked around in upstream, see mstorsjo/msvc-wine#47 for details.