fix: work plz

stmSi · Jan 29, 2024 · 13873c8 · 13873c8
1 parent 8c3d54d
commit 13873c8
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/.github/workflows/godot-ci.yml b/.github/workflows/godot-ci.yml
@@ -9,54 +9,54 @@ env:
 jobs:
   export-windows:
     name: Windows Export
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container:
-      image: 09799474633/mm-typing-game-godot
+      image: barichello/godot-ci:4.2.1
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           lfs: true
       - name: Setup
         run: |
-          mkdir -v -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable
-          cp -rvf /templates/${GODOT_VERSION}.stable/* ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable/
+          mkdir -v -p ~/.local/share/godot/export_templates
+          mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable
       - name: Windows Build
         run: |
           mkdir -v -p build/windows
-          cp -rvf Texts build/windows/
-          godot --headless --export-debug "Windows Desktop"
+          cd $PROJECT_PATH
+          godot --headless --verbose --export-release "Windows Desktop" ../build/windows/$EXPORT_NAME.exe
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
-          name: ultimate-myanmar-typing-wizard_windows_debug_x64_64.zip
+          name: $EXPORT_NAME-windows-x86-64
           path: build/windows
 
   export-linux:
     name: Linux Export
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container:
-      image: 09799474633/mm-typing-game-godot
+      image: barichello/godot-ci:4.2.1
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           lfs: true
       - name: Setup
         run: |
-          mkdir -v -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable
-          cp -rvf /templates/${GODOT_VERSION}.stable/* ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable/
+          mkdir -v -p ~/.local/share/godot/export_templates
+          mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable
       - name: Linux Build
         run: |
           mkdir -v -p build/linux
           cp -rvf Texts build/linux/
           godot --headless --export-debug "Linux/X11"
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3 # for some reason v4 fails in the linux export job
         with:
-          name: ultimate-myanmar-typing-wizard_linux_debug_x86_x64.zip
+          name: $EXPORT_NAME-linux-x86-64
           path: build/linux
 
   # export-web:
@@ -147,7 +147,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./build/ultimate-myanmar-typing-wizard_windows_debug_x64_64.zip
+        asset_path: ./build/windows/$EXPORT_NAME.exe
         asset_name: ultimate-myanmar-typing-wizard_windows_debug_x64_64.zip
         asset_content_type: application/zip
 
@@ -157,7 +157,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./build/ultimate-myanmar-typing-wizard_linux_debug_x86_x64.zip
+        asset_path: ./build/linux/$EXPORT_NAME.x86_64
         asset_name: ultimate-myanmar-typing-wizard_linux_debug_x86_x64.zip
         asset_content_type: application/zip