Reverted changes to workflows and added Mac Resource directory to sea…

…rch path for palettes
Orama-Interactive · Apr 29, 2024 · 5e2fc3a · 5e2fc3a
1 parent 4953c83
commit 5e2fc3a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/dev-desktop-builds.yml b/.github/workflows/dev-desktop-builds.yml
@@ -119,7 +119,6 @@ jobs:
         run: |
           chown runner ./Godot.app/Contents/MacOS/Godot
           chmod +x ./Godot.app/Contents/MacOS/Godot
-          rm ./pixelorama_data/.gdignore
           ./Godot.app/Contents/MacOS/Godot --headless -v --export-release "macOS" ./build/mac/Pixelorama.zip
       - name: Make application executable 🔧
         run: |
@@ -128,6 +127,10 @@ jobs:
           rm ./build/mac/Pixelorama.zip
       - name: Fix application icon 🖼
         run: sips -s format icns ./build/mac/Pixelorama.app/Contents/Resources/icon.icns --out ./build/mac/Pixelorama.app/Contents/Resources/icon.icns
+      - name: Copy pixelorama_data folder 📁
+        run: |
+          cp -R ./pixelorama_data ./build/mac/Pixelorama.app/Contents/Resources
+          rm ./build/mac/Pixelorama.app/Contents/Resources/pixelorama_data/.gdignore
       - name: Ad-hoc signing ✍️
         run: codesign -s - --force --deep ./build/mac/Pixelorama.app
       - name: Create DMG archive 🔧

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -143,7 +143,6 @@ jobs:
         run: |
           chown runner ./Godot.app/Contents/MacOS/Godot
           chmod +x ./Godot.app/Contents/MacOS/Godot
-          rm ./pixelorama_data/.gdignore
           ./Godot.app/Contents/MacOS/Godot --headless -v --export-release "macOS" ./build/mac/Pixelorama.zip
       - name: Make application executable 🔧
         run: |
@@ -152,6 +151,10 @@ jobs:
           rm ./build/mac/Pixelorama.zip
       - name: Fix application icon 🖼
         run: sips -s format icns ./build/mac/Pixelorama.app/Contents/Resources/icon.icns --out ./build/mac/Pixelorama.app/Contents/Resources/icon.icns
+      - name: Copy pixelorama_data folder 📁
+        run: |
+          cp -R ./pixelorama_data ./build/mac/Pixelorama.app/Contents/Resources
+          rm ./build/mac/Pixelorama.app/Contents/Resources/pixelorama_data/.gdignore
       - name: Ad-hoc signing ✍️
         run: codesign -s - --force --deep ./build/mac/Pixelorama.app
       - name: Create DMG archive 🔧

diff --git a/src/Autoload/Global.gd b/src/Autoload/Global.gd
@@ -660,7 +660,7 @@ func _init() -> void:
 	if OS.has_feature("template"):
 		root_directory = OS.get_executable_path().get_base_dir()
 	if OS.get_name() == "macOS":
-		root_directory = "res://"
+		data_directories.append(root_directory.path_join("../Resources").path_join(CONFIG_SUBDIR_NAME))
 	data_directories.append(root_directory.path_join(CONFIG_SUBDIR_NAME))
 	if OS.get_name() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "BSD"]:
 		# Checks the list of files var, and processes them.