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.

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

Workaround broken GitHub runner images #6683

Merged

Conversation

llvm-beanz
Copy link
Collaborator

@llvm-beanz llvm-beanz commented Jun 10, 2024

This PR contains two changes:

  1. Moves a pragma to disable a warning, which seems to be required by the new compiler.
  2. Adds a preprocessor define to workaround the crashes caused by the runner image mismatching C++ runtime versions.

The second change we will want to revert once the runner images are fixed. The issue tracking the runner images is:

actions/runner-images#10004

Related #6668

We do not want this change to stick around forever but we need it to
work around the broken GitHub runner images:

actions/runner-images#10004

Related microsoft#6668
@llvm-beanz llvm-beanz requested a review from a team as a code owner June 10, 2024 21:24
I'm guessing something changed about how this is interpreted in the
updated visual studio and it now needs to be before the declaration.

../projects/dxilconv/include/ShaderBinary/ShaderBinary.h
@damyanp
Copy link
Member

damyanp commented Jun 11, 2024

We do not want this change to stick around forever

I think that's true for the mutex/constexpr thing, but not for the moved pragma, right?

@llvm-beanz
Copy link
Collaborator Author

We do not want this change to stick around forever

I think that's true for the mutex/constexpr thing, but not for the moved pragma, right?

Probably right. I just added that change now because the debug build failed on my first change. I'll update the description.

@llvm-beanz llvm-beanz merged commit 0b9acdb into microsoft:main Jun 11, 2024
13 checks passed
llvm-beanz added a commit to llvm-beanz/DirectXShaderCompiler that referenced this pull request Jun 12, 2024
This removes the hack introduced in microsoft#6683 to workaround issues in the
GitHub and ADO runner image:
actions/runner-images#10004

Rumor has it the runner images are now fixed... let's see.

Fixes microsoft#6674
llvm-beanz added a commit that referenced this pull request Jun 17, 2024
This removes the hack introduced in #6683 to workaround issues in the
GitHub and ADO runner image:
actions/runner-images#10004

Rumor has it the runner images are now fixed... let's see.

Fixes #6674
pow2clk pushed a commit to pow2clk/DirectXShaderCompiler that referenced this pull request Jul 16, 2024
This PR contains two changes:
1) Moves a pragma to disable a warning, which seems to be required by
the new compiler.
2) Adds a preprocessor define to workaround the crashes caused by the
runner image mismatching C++ runtime versions.

The second change we will want to revert once the runner images are
fixed. The issue tracking the runner images is:

actions/runner-images#10004

Related microsoft#6668

(cherry picked from commit 0b9acdb)
pow2clk pushed a commit to pow2clk/DirectXShaderCompiler that referenced this pull request Jul 16, 2024
This removes the hack introduced in microsoft#6683 to workaround issues in the
GitHub and ADO runner image:
actions/runner-images#10004

Rumor has it the runner images are now fixed... let's see.

Fixes microsoft#6674

(cherry picked from commit 98bb80a)
pow2clk added a commit that referenced this pull request Jul 16, 2024
Merges the following changes into mesh nodes to fix a known bug that
required a point release in the march release branch and also some build
fixes for new visual studio diagnostics.

9ca52f4 Add duplicate pragma (#6732)
7809c0b Remove Windows C++ redist hack (#6692)
33277a1 Workaround broken GitHub runner images (#6683)
1b9a796 [Sema] Check FunctionDecl has identifier before getName.
(#6439) (#6457)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants