From fca91a7d489b186223743f71e8c7725d577a4fd1 Mon Sep 17 00:00:00 2001
From: Cory Petkovsek <632766+TokisanGames@users.noreply.github.com>
Date: Sun, 29 Sep 2024 22:22:55 +0700
Subject: [PATCH] Fix CI build after upload-artifact change excluding files

---
 .github/workflows/android.yml |  1 +
 .github/workflows/build.yml   |  3 +++
 .github/workflows/ios.yml     |  1 +
 .github/workflows/linux.yml   | 22 ++++++++++++----------
 .github/workflows/macos.yml   |  1 +
 .github/workflows/windows.yml | 22 +++++++++++-----------
 .gitignore                    |  2 +-
 7 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 021232890..fc582bd04 100644
--- 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
index 2b6f7c3f0..d7b45859b 100644
--- 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
index 44cf1ce61..c304fa9c6 100644
--- 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
index 6204bfc54..0ab22a4c6 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -47,17 +47,19 @@ 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
-    needs: build
-    steps:
-      - name: Merge Artifacts
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: ${{ github.event.repository.name }}
-          pattern: t3d-*
-          delete-merged: true
\ No newline at end of file
+  # merge:
+  #   runs-on: ubuntu-latest
+  #   needs: build
+  #   steps:
+  #     - name: Merge Artifacts
+  #       uses: actions/upload-artifact/merge@v4
+  #       with:
+  #         name: ${{ github.event.repository.name }}
+  #         pattern: t3d-*
+  #         delete-merged: true
\ No newline at end of file
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 1fdb724aa..300183a36 100644
--- 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
index b0d6d2583..e720b44a2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -48,19 +48,19 @@ 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: |
             ${{ github.workspace }}/project/
 
-  merge:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Merge Artifacts
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: ${{ github.event.repository.name }}
-          pattern: t3d-*
-          delete-merged: true
\ No newline at end of file
+  # merge:
+  #   runs-on: ubuntu-latest
+  #   needs: build
+  #   steps:
+  #     - name: Merge Artifacts
+  #       uses: actions/upload-artifact/merge@v4
+  #       with:
+  #         name: ${{ github.event.repository.name }}
+  #         pattern: t3d-*
+  #         delete-merged: true
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index e7403a702..6f65a976a 100644
--- 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/