fix build.yml

3ddelano · Apr 19, 2024 · 6589add · 6589add
1 parent 978ff33
commit 6589add
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -161,30 +161,31 @@ jobs:
             - name: Create artifact folder
               shell: sh
               run: |
-                  mkdir -p '${{ github.workspace }}/artifact/${{ github.event.repository.name }}/'
+                  mkdir -p '${{ github.workspace }}/artifact-${{ matrix.identifier }}/${{ github.event.repository.name }}/'
 
             - name: Copy addons folder to artifact folder
               shell: sh
               run: |
-                  cp -n -r '${{ github.workspace }}/sample/addons' '${{ github.workspace }}/artifact/${{ github.event.repository.name }}/'
+                  cp -n -r '${{ github.workspace }}/sample/addons' '${{ github.workspace }}/artifact-${{ matrix.identifier }}/${{ github.event.repository.name }}/'
 
             - name: (Windows) Delete compilation files
               if: ${{ matrix.platform == 'windows' }}
               run: |
-                  Remove-Item ${{ github.workspace }}/artifact/${{ github.event.repository.name }}/addons/epic-online-services-godot/bin/windows/* -Include *.exp,*.lib,*.ilk -Force
-
-            - name: Upload artifact ${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.arch }}
-              uses: actions/upload-artifact@v3
-              with:
-                  name: ${{ github.event.repository.name }}-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.arch }}-${{ github.sha }}
-                  path: |
-                      ${{ github.workspace }}/${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.arch }}/artifact/
-                  retention-days: 14
+                  Remove-Item ${{ github.workspace }}/artifact-${{ matrix.identifier }}/${{ github.event.repository.name }}/addons/epic-online-services-godot/bin/windows/* -Include *.exp,*.lib,*.ilk -Force
 
             - name: Upload artifact
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
-                  name: ${{ github.event.repository.name }}-all${{ github.sha }}
+                  name: ${{ github.event.repository.name }}-${{ matrix.identifier }}-${{ github.sha }}
                   path: |
-                      ${{ github.workspace }}/artifact/
+                      ${{ github.workspace }}/artifact-${{ matrix.identifier }}/
                   retention-days: 14
+    merge:
+        runs-on: ubuntu-latest
+        needs: build
+        steps:
+            - name: Merge artifacts
+              uses: actions/upload-artifact/merge@v4
+              with:
+                  name: ${{ github.event.repository.name }}-all-${{ github.sha }}
+                  pattern: ${{ github.workspace }}/artifact-*
diff --git a/sample/components/StyledPopupWindow/StyledPopupWindowTheme.tres b/sample/components/StyledPopupWindow/StyledPopupWindowTheme.tres
diff --git a/sample/project.godot b/sample/project.godot
@@ -24,7 +24,6 @@ EOSGRuntime="*res://addons/epic-online-services-godot/runtime.gd"
 [display]
 
 window/stretch/mode="canvas_items"
-window/stretch/scale_mode="integer"
 
 [dotnet]