Merge branch 'master' of https://github.com/JunaMeinhold/HexaEngine.I…

…mGui
HexaEngine · Oct 11, 2024 · 035e7a9 · 035e7a9
2 parents 43188ea + be38e3b
commit 035e7a9
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 9 deletions.
diff --git a/.github/workflows/cimgui-android-cmake.yml b/.github/workflows/cimgui-android-cmake.yml
@@ -111,7 +111,7 @@ jobs:
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: ${{ matrix.lib }}-${{ matrix.os }}-${{ matrix.arch }}-artifacts 
+        name: ${{ matrix.lib }}-android-latest-all-artifacts 
         path: |
           ${{ matrix.lib }}/build/arm64-v8a/*.so
           ${{ matrix.lib }}/build/x86_64/*.so

diff --git a/.github/workflows/cimgui-cmake.yml b/.github/workflows/cimgui-cmake.yml
@@ -67,12 +67,17 @@ jobs:
     - name: Build cimgui
       run: cmake --build cimgui/build --config Release
 
+    - name: Move Windows binaries
+      if: matrix.os == 'windows-latest'
+      run: |
+        mv cimgui/build/Release/*.dll cimgui/build/
+
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: ${{ matrix.os }}-${{ matrix.arch }}-artifacts 
+        name: cimgui-${{ matrix.os }}-${{ matrix.arch }}-artifacts 
         path: |
-          cimgui/build/Release/*.dll
+          cimgui/build/*.dll
           cimgui/build/*.so
           cimgui/build/*.dylib
         if-no-files-found: ignore # 'warn' or 'ignore' or 'error'
diff --git a/.github/workflows/cimguizmo-cmake.yml b/.github/workflows/cimguizmo-cmake.yml
@@ -72,12 +72,17 @@ jobs:
     - name: Build cimguizmo
       run: cmake --build cimguizmo/build --config Release
 
+    - name: Move Windows binaries
+      if: matrix.os == 'windows-latest'
+      run: |
+        mv cimguizmo/build/Release/*.dll cimguizmo/build/
+
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: ${{ matrix.os }}-${{ matrix.arch }}-artifacts 
+        name: cimguizmo-${{ matrix.os }}-${{ matrix.arch }}-artifacts 
         path: |
-          cimguizmo/build/Release/*.dll
+          cimguizmo/build/*.dll
           cimguizmo/build/*.so
           cimguizmo/build/*.dylib
         if-no-files-found: ignore # 'warn' or 'ignore' or 'error'
diff --git a/.github/workflows/cimnodes-cmake.yml b/.github/workflows/cimnodes-cmake.yml
@@ -72,12 +72,17 @@ jobs:
     - name: Build cimnodes
       run: cmake --build cimnodes/build --config Release
 
+    - name: Move Windows binaries
+      if: matrix.os == 'windows-latest'
+      run: |
+        mv cimnodes/build/Release/*.dll cimnodes/build/
+
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: ${{ matrix.os }}-${{ matrix.arch }}-artifacts 
+        name: cimnodes-${{ matrix.os }}-${{ matrix.arch }}-artifacts 
         path: |
-          cimnodes/build/Release/*.dll
+          cimnodes/build/*.dll
           cimnodes/build/*.so
           cimnodes/build/*.dylib
         if-no-files-found: ignore # 'warn' or 'ignore' or 'error'
diff --git a/.github/workflows/cimplot-cmake.yml b/.github/workflows/cimplot-cmake.yml
@@ -72,12 +72,17 @@ jobs:
     - name: Build cimnodes
       run: cmake --build cimplot/build --config Release
 
+    - name: Move Windows binaries
+      if: matrix.os == 'windows-latest'
+      run: |
+        mv cimplot/build/Release/*.dll cimplot/build/
+
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: ${{ matrix.os }}-${{ matrix.arch }}-artifacts 
+        name: cimplot-${{ matrix.os }}-${{ matrix.arch }}-artifacts 
         path: |
-          cimplot/build/Release/*.dll
+          cimplot/build/*.dll
           cimplot/build/*.so
           cimplot/build/*.dylib
         if-no-files-found: ignore # 'warn' or 'ignore' or 'error'