Fix CI build after upload-artifact change excluding files

TokisanGames · Sep 29, 2024 · a70bcfd · a70bcfd
1 parent e23c449
commit a70bcfd
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -52,6 +52,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: t3d-${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.target }}
+          include-hidden-files: true
           path: |
             ${{ github.workspace }}/project/
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -102,9 +102,12 @@ jobs:
       - name: Upload Package
         uses: actions/upload-artifact@v4
         with:
+          include-hidden-files: true
           name: t3d-${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.target }}
           path: |
             ${{ github.workspace }}/project/
+            ${{ github.workspace }}/project/addons/terrain_3d/brushes/.gdignore
+
 
   merge:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -46,6 +46,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: t3d-${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.target }}
+          include-hidden-files: true
           path: |
             ${{ github.workspace }}/project/
 

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -47,9 +47,11 @@ jobs:
       - name: Upload Package
         uses: actions/upload-artifact@v4
         with:
+          include-hidden-files: true
           name: t3d-${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.target }}
           path: |
             ${{ github.workspace }}/project/
+            ${{ github.workspace }}/project/addons/terrain_3d/brushes/.gdignore
 
   merge:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -46,6 +46,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: t3d-${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.target }}
+          include-hidden-files: true
           path: |
             ${{ github.workspace }}/project/
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -48,7 +48,7 @@ jobs:
           cp '${{ github.workspace }}/README.md' '${{ github.workspace }}/LICENSE.txt' ${{ github.workspace }}/project/addons/terrain_3d/
 
       - name: Upload Package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: t3d-${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.target }}
           path: |

diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ export_presets.cfg
 .scons-cache/
 *.os
 *.obj
+*.o
 
 # SConstruct
 .sconf_temp
@@ -35,4 +36,3 @@ export_presets.cfg
 # Editors
 .vscode/
 .vs/
-project/addons/explore-editor-theme/