Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: Remove quirk that runs dummy command after wineserver #1320

Closed
wants to merge 1 commit into from
Closed

ci: Remove quirk that runs dummy command after wineserver #1320

wants to merge 1 commit into from

Conversation

real-or-random
Copy link
Contributor

The underlying issue is now worked around in upstream, see mstorsjo/msvc-wine#47 for details.

hebasto
hebasto approved these changes May 24, 2023
View reviewed changes
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 3f67571, I have reviewed the code and it looks OK.

@real-or-random real-or-random mentioned this pull request May 24, 2023
Closed
@hebasto
Copy link
Member

hebasto commented Jun 1, 2023

Maybe rebase on top of the #1326?

@real-or-random
ci: Remove quirk that runs dummy command after wineserver
cb9056b 
The underlying issue is now worked around in upstream, see
mstorsjo/msvc-wine#47 for details.
@real-or-random real-or-random force-pushed the 202305-wineserver-workaround branch from 3f67571 to cb9056b Compare June 1, 2023 20:02
@real-or-random
Copy link
Contributor Author

rebased on master

This was referenced Jun 2, 2023
Merged
Merged
@hebasto
Copy link
Member

hebasto commented Jun 2, 2023

I took liberty to combine this PR into #1337.

@real-or-random
Copy link
Contributor Author

Let me manually retrigger CI here. I could imagine Cirrus is confused and still uses the old image here for some reason.

@real-or-random
Copy link
Contributor Author

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.

@real-or-random
Copy link
Contributor Author

Closing in favor of #1337.

real-or-random added a commit that referenced this pull request Jun 3, 2023
@real-or-random
Merge #1337: ci: Fix error D8037 in cl.exe (attempt 2)
60556c9 
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
Reviewers

@hebasto hebasto hebasto approved these changes

Assignees
No one assigned
Labels
ci
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@real-or-random @hebasto