浏览代码

Check MinGW compatibility | Linux_MinGW forkflow: upgrade Ubuntu to 22.04 (#3059)

Old MinGW write broken shader cache https://github.com/urho3d/Urho3D/issues/2887
1vanK 3 年之前
父节点
当前提交
79ae3833ed
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 1 1
      .github/workflows/main.yml
  2. 5 0
      Source/Urho3D/GraphicsAPI/Direct3D11/D3D11ShaderVariation.cpp

+ 1 - 1
.github/workflows/main.yml

@@ -479,7 +479,7 @@ jobs:
         xvfb-run ctest --test-dir $HOME/projects/UrhoApp_build
         xvfb-run ctest --test-dir $HOME/projects/UrhoApp_build
 
 
   Linux_MinGW:
   Linux_MinGW:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: init
     needs: init
     if: needs.init.outputs.skip == '0'
     if: needs.init.outputs.skip == '0'
 
 

+ 5 - 0
Source/Urho3D/GraphicsAPI/Direct3D11/D3D11ShaderVariation.cpp

@@ -14,6 +14,11 @@
 
 
 #include <d3dcompiler.h>
 #include <d3dcompiler.h>
 
 
+// https://github.com/urho3d/Urho3D/issues/2887
+#if defined(__MINGW32__) && !defined(D3D_COMPILER_VERSION)
+#error Please update MinGW
+#endif
+
 #include "../../DebugNew.h"
 #include "../../DebugNew.h"
 
 
 namespace Urho3D
 namespace Urho3D