hmm

Author: bend-n

.github/actions/build-upload-image/action.yml

@@ -19,16 +19,16 @@ runs:
       uses: bend-n/godot-builds/.github/actions/get-version@main
 
     - name: Get templates
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: templates
 
-    - name: Get editor
-      uses: actions/download-artifact@v3
+    - name: Get headless editor
+      uses: actions/download-artifact@v4
       with:
-        name: linuxbsd-editor-release
+        name: server-editor-release
 
-    - run: mv godot.x11.opt.64 godot && chmod -v +x godot
+    - run: mv godot_server.x11.opt.64 godot && chmod -v +x godot
       shell: bash
 
     - name: Login to GitHub Container Registry

.github/actions/release/action.yml

@@ -17,12 +17,12 @@ runs:
       uses: bend-n/godot-builds/.github/actions/get-version@main
 
     - name: Get templates
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: templates
 
     - name: Get editor
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: linuxbsd-editor-release
 

.github/actions/upload-artifact/action.yml

@@ -16,9 +16,9 @@ runs:
   using: "composite"
   steps:
     - name: Upload Godot Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: ${{ inputs.name }}
+        name: ${{ inputs.name }}-${{ matrix.target }}
         path: ${{ inputs.path }}
         retention-days: 14
         if-no-files-found: error

.github/workflows/reusable-build.yml

@@ -179,6 +179,7 @@ jobs:
         uses: bend-n/godot-builds/.github/actions/upload-artifact@main
         with:
           path: godot/bin/*.zip
+          name: ${{ inputs.name }}-${{ matrix.target }}-${{ matrix.flags }}
 
   templates:
     needs: [web, macos, windows, linux, android]
@@ -188,11 +189,14 @@ jobs:
       tmps: "templates"
     steps:
       - name: Download all artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: List all downloaded files
         run: ls -R
 
+      - name: flatten
+        run: find . -mindepth 2 -type f -exec mv -t . -i '{}' +
+
       - name: Getdot
         uses: actions/checkout@v3
         with:
@@ -207,31 +211,31 @@ jobs:
           mkdir -vp "$tmps"
           echo "Preparing linux"
           linux="godot.x11.opt"
-          mv "linux/$linux.64" "$tmps/linux_x11_debug.x86_64"
-          mv "linux/$linux.debug.64" "$tmps/linux_x11_release.x86_64"
+          mv "$linux.64" "$tmps/linux_x11_debug.x86_64"
+          mv "$linux.debug.64" "$tmps/linux_x11_release.x86_64"
 
           echo "Preparing windows"
           windows="godot.windows.opt"
           # mv "windows/$windows.debug.64.exe" "$tmps/windows_debug_x86_64.exe"
-          mv "windows/$windows.64.exe" "$tmps/windows_release_x86_64.exe"
+          mv "$windows.64.exe" "$tmps/windows_release_x86_64.exe"
 
           echo "Preparing android"
           # mv "android/android_debug.apk" "$tmps/android_debug.apk"
-          mv "android/android_release.apk" "$tmps/android_release.apk"
+          mv "android_release.apk" "$tmps/android_release.apk"
 
           echo "Preparing macos"
           mac="godot.osx.opt"
           cp -r "godot-repo/misc/dist/osx_template.app" "."
           mkdir -p "osx_template.app/Contents/MacOS"
-          cp "macos/$mac.universal" "osx_template.app/Contents/MacOS/godot_osx_release.64"
+          cp "$mac.universal" "osx_template.app/Contents/MacOS/godot_osx_release.64"
           # cp "macos/$mac.debug.universal" "osx_template.app/Contents/MacOS/godot_osx_debug.64"
           chmod +x osx_template.app/Contents/MacOS/*.64
           zip -q -9 -r "$tmps/osz.zip" "osx_template.app"
 
           echo "Preparing web"
           web="godot.javascript.opt"
-          mv "web/$web.zip" "$tmps/webassembly_release.zip"
-          mv "web/$web.gdnative.zip" "$tmps/webassembly_gdnative_release.zip"
+          mv "$web.zip" "$tmps/webassembly_release.zip"
+          mv "$web.gdnative.zip" "$tmps/webassembly_gdnative_release.zip"
 
       - name: Prepare bundle
         run: cd "${tmps}" && zip -qr9 templates.tpz ./*
@@ -240,21 +244,25 @@ jobs:
         uses: bend-n/godot-builds/.github/actions/upload-artifact@main
         with:
           path: ${{ env.tmps }}/templates.tpz
+          name: templates
 
   editor:
+    strategy:
+      matrix:
+        platform: [server, linuxbsd]
     name: Linux editor
     runs-on: ubuntu-20.04
     steps:
       - name: Compilation
         uses: bend-n/godot-builds/.github/actions/build-godot@main
         with:
-          platform: linuxbsd
+          platform: ${{ matrix.platform }}
           target: release
 
       - name: Upload artifact
         uses: bend-n/godot-builds/.github/actions/upload-artifact@main
         with:
-          name: linuxbsd-editor-release
+          name: ${{ matrix.platform }}-editor-release
           path: godot/bin/*.64
 
   image: