From c1f87c9e12d32ffee9b3e8a755fb22ea5612984f Mon Sep 17 00:00:00 2001
From: Hugo Locurcio <hugo.locurcio@hugo.pro>
Date: Thu, 21 Dec 2023 17:43:37 +0100
Subject: [PATCH] Fix Godot CLI arguments to use `--headless` everywhere (#113)

- Use long-form `--verbose` and `--editor` for better readability.
---
 .github/workflows/godot-ci.yml | 10 +++++-----
 .gitlab-ci.yml                 | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml
index 93fbc0c..8dea4ca 100644
--- a/.github/workflows/godot-ci.yml
+++ b/.github/workflows/godot-ci.yml
@@ -5,7 +5,7 @@ env:
   GODOT_VERSION: 3.3.4
   EXPORT_NAME: test-project
   PROJECT_PATH: test-project
-  
+
 jobs:
   export-windows:
     name: Windows Export
@@ -25,7 +25,7 @@ jobs:
         run: |
           mkdir -v -p build/windows
           cd $PROJECT_PATH
-          godot -v --export "Windows Desktop" ../build/windows/$EXPORT_NAME.exe
+          godot --headless --verbose --export-release "Windows Desktop" ../build/windows/$EXPORT_NAME.exe
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:
@@ -50,7 +50,7 @@ jobs:
         run: |
           mkdir -v -p build/linux
           cd $PROJECT_PATH
-          godot -v --export "Linux/X11" ../build/linux/$EXPORT_NAME.x86_64
+          godot --headless --verbose --export-release "Linux/X11" ../build/linux/$EXPORT_NAME.x86_64
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:
@@ -75,7 +75,7 @@ jobs:
         run: |
           mkdir -v -p build/web
           cd $PROJECT_PATH
-          godot -v --export "HTML5" ../build/web/index.html
+          godot --headless --verbose --export-release "HTML5" ../build/web/index.html
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:
@@ -108,7 +108,7 @@ jobs:
         run: |
           mkdir -v -p build/mac
           cd $PROJECT_PATH
-          godot -v --export "Mac OSX" ../build/mac/$EXPORT_NAME.zip
+          godot --headless --verbose --export-release "Mac OSX" ../build/mac/$EXPORT_NAME.zip
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36d24bf..2de43ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,14 +21,14 @@ variables:
 import-assets:
   stage: import-assets
   script:
-    - godot -v -e --quit --headless
+    - godot --headless --verbose --editor --quit
 
 linux:
   stage: export
   script:
     - mkdir -v -p build/linux
     - cd $EXPORT_NAME
-    - godot -v --export-release --headless "Linux/X11" ../build/linux/$EXPORT_NAME.x86_64
+    - godot --headless --verbose --export-release "Linux/X11" ../build/linux/$EXPORT_NAME.x86_64
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
     paths:
@@ -39,7 +39,7 @@ windows:
   script:
     - mkdir -v -p build/windows
     - cd $EXPORT_NAME
-    - godot -v --export-release --headless "Windows Desktop" ../build/windows/$EXPORT_NAME.exe
+    - godot --headless --verbose --export-release "Windows Desktop" ../build/windows/$EXPORT_NAME.exe
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
     paths:
@@ -50,7 +50,7 @@ mac:
   script:
     - mkdir -v -p build/mac
     - cd $EXPORT_NAME
-    - godot -v --export-release --headless "Mac OSX" ../build/mac/$EXPORT_NAME.zip
+    - godot --headless --verbose --export-release "Mac OSX" ../build/mac/$EXPORT_NAME.zip
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
     paths:
@@ -61,7 +61,7 @@ web:
   script:
     - mkdir -v -p build/web
     - cd $EXPORT_NAME
-    - godot -v --export-release --headless "HTML5" ../build/web/index.html
+    - godot --headless --verbose --export-release "HTML5" ../build/web/index.html
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
     paths:
@@ -73,7 +73,7 @@ android_debug:
   script:
     - mkdir -v -p build/android
     - cd $EXPORT_NAME
-    - godot -v --export-debug --headless "Android Debug" ../build/android/$EXPORT_NAME-debug.apk
+    - godot --headless --verbose --export-debug "Android Debug" ../build/android/$EXPORT_NAME-debug.apk
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
     paths:
@@ -99,7 +99,7 @@ android:
     - sed 's@keystore/release=".*"@keystore/release="'/root/release.keystore'"@g' -i export_presets.cfg
     - sed 's@keystore/release_user=".*"@keystore/release_user="'$SECRET_RELEASE_KEYSTORE_USER'"@g' -i export_presets.cfg
     - sed 's@keystore/release_password=".*"@keystore/release_password="'$SECRET_RELEASE_KEYSTORE_PASSWORD'"@g' -i export_presets.cfg
-    - godot -v --export-release --headless "Android" ../build/android/$EXPORT_NAME.apk
+    - godot --headless --verbose --export-release "Android" ../build/android/$EXPORT_NAME.apk
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
     paths: