From 746c4d8031f0c83e4e8b6ff14ac0e0c102085f07 Mon Sep 17 00:00:00 2001
From: Adrasteon Dev <adrasteon@tutanota.com>
Date: Sun, 23 Apr 2023 17:23:45 +0200
Subject: [PATCH 1/6] Use the dotnet sdk image for Godot 4 mono

---
 .github/workflows/manual_build.yml | 1 +
 .github/workflows/release.yml      | 1 +
 mono.Dockerfile                    | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/manual_build.yml b/.github/workflows/manual_build.yml
index afd9051..db90855 100644
--- a/.github/workflows/manual_build.yml
+++ b/.github/workflows/manual_build.yml
@@ -75,6 +75,7 @@ jobs:
             ghcr.io/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:mono-${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}
             ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:mono-${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}
           build-args: |
+            IMAGE=${{ startsWith( github.event.inputs.version, '3.' ) && 'mono:latest' || 'mcr.microsoft.com/dotnet/sdk:6.0-focal' }}
             GODOT_VERSION=${{ github.event.inputs.version }}
             RELEASE_NAME=${{ github.event.inputs.release_name }}
             SUBDIR=${{  github.event.inputs.release_name != 'stable' && format('/{0}', github.event.inputs.release_name) || '' }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 35f1904..c4b991a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -81,6 +81,7 @@ jobs:
             ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:mono-latest
             ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:mono-${{ needs.version.outputs.version }}
           build-args: |
+            IMAGE=${{ startsWith( needs.version.outputs.version, '3.' ) && 'mono:latest' || 'mcr.microsoft.com/dotnet/sdk:6.0-focal' }}
             GODOT_VERSION=${{ needs.version.outputs.version }}
             RELEASE_NAME=${{ needs.version.outputs.release_name }}
             ZIP_GODOT_PLATFORM=${{ startsWith( needs.version.outputs.version, '3.' ) && 'linux_headless_64' || 'linux_x86_64' }}
diff --git a/mono.Dockerfile b/mono.Dockerfile
index e7d1c57..1f74bf9 100644
--- a/mono.Dockerfile
+++ b/mono.Dockerfile
@@ -1,4 +1,5 @@
-FROM mono:latest
+ARG IMAGE="mono:latest"
+FROM $IMAGE
 LABEL author="https://github.com/aBARICHELLO/godot-ci/graphs/contributors"
 
 USER root

From 00b662af6a04f644b217686d0510deba2fd4fccd Mon Sep 17 00:00:00 2001
From: Adrasteon Dev <adrasteon@tutanota.com>
Date: Sun, 23 Apr 2023 22:31:59 +0200
Subject: [PATCH 2/6] Addition of comments in CI files for Godot 4

---
 .github/workflows/godot-ci.yml | 8 ++++----
 .gitlab-ci.yml                 | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml
index 93fbc0c..b44f6a3 100644
--- a/.github/workflows/godot-ci.yml
+++ b/.github/workflows/godot-ci.yml
@@ -21,7 +21,7 @@ jobs:
         run: |
           mkdir -v -p ~/.local/share/godot/templates
           mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
-      - name: Windows Build
+      - name: Windows Build  # Use "--headless --export-release" instead of "--export" with Godot 4
         run: |
           mkdir -v -p build/windows
           cd $PROJECT_PATH
@@ -46,7 +46,7 @@ jobs:
         run: |
           mkdir -v -p ~/.local/share/godot/templates
           mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
-      - name: Linux Build
+      - name: Linux Build  # Use "--headless --export-release" instead of "--export" with Godot 4
         run: |
           mkdir -v -p build/linux
           cd $PROJECT_PATH
@@ -71,7 +71,7 @@ jobs:
         run: |
           mkdir -v -p ~/.local/share/godot/templates
           mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
-      - name: Web Build
+      - name: Web Build  # Use "--headless --export-release" instead of "--export" with Godot 4
         run: |
           mkdir -v -p build/web
           cd $PROJECT_PATH
@@ -104,7 +104,7 @@ jobs:
         run: |
           mkdir -v -p ~/.local/share/godot/templates
           mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
-      - name: Mac Build
+      - name: Mac Build  # Use "--headless --export-release" instead of "--export" with Godot 4
         run: |
           mkdir -v -p build/mac
           cd $PROJECT_PATH
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e200420..18770e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,7 @@ linux:
   script:
     - mkdir -v -p build/linux
     - cd $EXPORT_NAME
+    # Use "--headless --export-release" instead of "--export" with Godot 4
     - godot -v --export "Linux/X11" ../build/linux/$EXPORT_NAME.x86_64
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
@@ -32,6 +33,7 @@ windows:
   script:
     - mkdir -v -p build/windows
     - cd $EXPORT_NAME
+    # Use "--headless --export-release" instead of "--export" with Godot 4
     - godot -v --export "Windows Desktop" ../build/windows/$EXPORT_NAME.exe
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
@@ -43,6 +45,7 @@ mac:
   script:
     - mkdir -v -p build/mac
     - cd $EXPORT_NAME
+    # Use "--headless --export-release" instead of "--export" with Godot 4
     - godot -v --export "Mac OSX" ../build/mac/$EXPORT_NAME.zip
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
@@ -54,6 +57,7 @@ web:
   script:
     - mkdir -v -p build/web
     - cd $EXPORT_NAME
+    # Use "--headless --export-release" instead of "--export" with Godot 4
     - godot -v --export "HTML5" ../build/web/index.html
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
@@ -66,6 +70,7 @@ android_debug:
   script:
     - mkdir -v -p build/android
     - cd $EXPORT_NAME
+    # Add "--headless" with Godot 4
     - godot -v --export-debug "Android Debug" ../build/android/$EXPORT_NAME-debug.apk
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
@@ -92,6 +97,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
+    # Use "--headless --export-release" instead of "--export" with Godot 4
     - godot -v --export "Android" ../build/android/$EXPORT_NAME.apk
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME

From 9789ccab500459a811b1dfa5d44402623c5db71d Mon Sep 17 00:00:00 2001
From: Adrasteon Dev <adrasteon@tutanota.com>
Date: Mon, 24 Apr 2023 20:10:18 +0200
Subject: [PATCH 3/6] Addition of comments for macOS for Godot 4

---
 .github/workflows/godot-ci.yml | 2 +-
 .gitlab-ci.yml                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml
index b44f6a3..e8f766f 100644
--- a/.github/workflows/godot-ci.yml
+++ b/.github/workflows/godot-ci.yml
@@ -104,7 +104,7 @@ jobs:
         run: |
           mkdir -v -p ~/.local/share/godot/templates
           mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
-      - name: Mac Build  # Use "--headless --export-release" instead of "--export" with Godot 4
+      - name: Mac Build  # Use "--headless --export-release" instead of "--export" and "macOS" instead of "Mac OSX" with Godot 4
         run: |
           mkdir -v -p build/mac
           cd $PROJECT_PATH
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18770e5..6b72ee5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,6 +46,7 @@ mac:
     - mkdir -v -p build/mac
     - cd $EXPORT_NAME
     # Use "--headless --export-release" instead of "--export" with Godot 4
+    # Use "macOS" instead of "Mac OSX" with Godot 4
     - godot -v --export "Mac OSX" ../build/mac/$EXPORT_NAME.zip
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME

From 721d3f573345f3b974375caae270678a22c78989 Mon Sep 17 00:00:00 2001
From: Adrasteon Dev <adrasteon@tutanota.com>
Date: Mon, 24 Apr 2023 20:32:56 +0200
Subject: [PATCH 4/6] Correction of a bug concerning export templates in the
 mono Dockerfile

---
 mono.Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mono.Dockerfile b/mono.Dockerfile
index 1f74bf9..d739a9a 100644
--- a/mono.Dockerfile
+++ b/mono.Dockerfile
@@ -37,6 +37,7 @@ RUN wget https://downloads.tuxfamily.org/godotengine/${GODOT_VERSION}${SUBDIR}/m
 RUN mkdir ~/.cache \
     && mkdir -p ~/.config/godot \
     && mkdir -p ~/.local/share/godot/templates/${GODOT_VERSION}.${RELEASE_NAME}.mono \
+    && ln -s ~/.local/share/godot/templates ~/.local/share/godot/export_templates \
     && unzip Godot_v${GODOT_VERSION}-${RELEASE_NAME}_mono_${ZIP_GODOT_PLATFORM}.zip \
     && mv Godot_v${GODOT_VERSION}-${RELEASE_NAME}_mono_${ZIP_GODOT_PLATFORM}/Godot_v${GODOT_VERSION}-${RELEASE_NAME}_mono_${FILENAME_GODOT_PLATFORM} /usr/local/bin/godot \
     && mv Godot_v${GODOT_VERSION}-${RELEASE_NAME}_mono_${ZIP_GODOT_PLATFORM}/GodotSharp /usr/local/bin/GodotSharp \

From e263c48940866f54f93dd22d245d135eec503b43 Mon Sep 17 00:00:00 2001
From: Adrasteon Dev <adrasteon@tutanota.com>
Date: Mon, 1 May 2023 07:03:20 +0200
Subject: [PATCH 5/6] Modification of the mono files following PR #107 and #108

---
 .github/workflows/manual_build.yml | 2 +-
 .github/workflows/release.yml      | 2 +-
 mono.Dockerfile                    | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/manual_build.yml b/.github/workflows/manual_build.yml
index db90855..6bcb5be 100644
--- a/.github/workflows/manual_build.yml
+++ b/.github/workflows/manual_build.yml
@@ -75,7 +75,7 @@ jobs:
             ghcr.io/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:mono-${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}
             ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:mono-${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}
           build-args: |
-            IMAGE=${{ startsWith( github.event.inputs.version, '3.' ) && 'mono:latest' || 'mcr.microsoft.com/dotnet/sdk:6.0-focal' }}
+            IMAGE=${{ startsWith( github.event.inputs.version, '3.' ) && 'mono:latest' || 'mcr.microsoft.com/dotnet/sdk:7.0-jammy' }}
             GODOT_VERSION=${{ github.event.inputs.version }}
             RELEASE_NAME=${{ github.event.inputs.release_name }}
             SUBDIR=${{  github.event.inputs.release_name != 'stable' && format('/{0}', github.event.inputs.release_name) || '' }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c4b991a..5ce91aa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -81,7 +81,7 @@ jobs:
             ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:mono-latest
             ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:mono-${{ needs.version.outputs.version }}
           build-args: |
-            IMAGE=${{ startsWith( needs.version.outputs.version, '3.' ) && 'mono:latest' || 'mcr.microsoft.com/dotnet/sdk:6.0-focal' }}
+            IMAGE=${{ startsWith( needs.version.outputs.version, '3.' ) && 'mono:latest' || 'mcr.microsoft.com/dotnet/sdk:7.0-jammy' }}
             GODOT_VERSION=${{ needs.version.outputs.version }}
             RELEASE_NAME=${{ needs.version.outputs.release_name }}
             ZIP_GODOT_PLATFORM=${{ startsWith( needs.version.outputs.version, '3.' ) && 'linux_headless_64' || 'linux_x86_64' }}
diff --git a/mono.Dockerfile b/mono.Dockerfile
index d739a9a..1152d93 100644
--- a/mono.Dockerfile
+++ b/mono.Dockerfile
@@ -8,8 +8,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
     git \
     git-lfs \
-    python \
-    python-openssl \
     unzip \
     wget \
     zip \
@@ -18,7 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # When in doubt see the downloads page
 # https://downloads.tuxfamily.org/godotengine/
-ARG GODOT_VERSION="3.4.2"
+ARG GODOT_VERSION="4.0.2"
 
 # Example values: stable, beta3, rc1, alpha2, etc.
 # Also change the SUBDIR property when NOT using stable

From 4128231f932a8a9d9561e903c71650505c6824f0 Mon Sep 17 00:00:00 2001
From: Adrasteon <73344919+AdrasteonDev@users.noreply.github.com>
Date: Sun, 16 Jul 2023 15:59:25 +0200
Subject: [PATCH 6/6] Addition of comments in godot-ci.yml about Godot 4

---
 .github/workflows/godot-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml
index e8f766f..1cf028e 100644
--- a/.github/workflows/godot-ci.yml
+++ b/.github/workflows/godot-ci.yml
@@ -9,7 +9,7 @@ env:
 jobs:
   export-windows:
     name: Windows Export
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-20.04  # Use 22.04 with godot 4
     container:
       image: barichello/godot-ci:3.3.4
     steps:
@@ -34,7 +34,7 @@ jobs:
 
   export-linux:
     name: Linux Export
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-20.04  # Use 22.04 with godot 4
     container:
       image: barichello/godot-ci:3.3.4
     steps:
@@ -59,7 +59,7 @@ jobs:
 
   export-web:
     name: Web Export
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-20.04  # Use 22.04 with godot 4
     container:
       image: barichello/godot-ci:3.3.4
     steps:
@@ -92,7 +92,7 @@ jobs:
 
   export-mac:
     name: Mac Export
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-20.04  # Use 22.04 with godot 4
     container:
       image: barichello/godot-ci:3.3.4
     steps: