add android x86_64 workflow, fix build workflow

3ddelano · Apr 19, 2024 · 978ff33 · 978ff33
1 parent b2b7c74
commit 978ff33
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -68,9 +68,23 @@ jobs:
                       dev_build: no
                       platform: android
                       arch: arm64
+                    - identifier: android-x86_64-debug
+                      name: 🤖 Android x86_64 Debug
+                      runner: ubuntu-20.04
+                      target: template_debug
+                      dev_build: yes
+                      platform: android
+                      arch: x86_64
+                    - identifier: android-x86_64-release
+                      name: 🤖 Android x86_64 Release
+                      runner: ubuntu-20.04
+                      target: template_release
+                      dev_build: no
+                      platform: android
+                      arch: x86_64
         steps:
             - name: Set up Python
-              uses: actions/setup-python@v4
+              uses: actions/setup-python@v5
               with:
                   python-version: "3.x"
 
@@ -82,19 +96,20 @@ jobs:
                   scons --version
 
             - name: Checkout project
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   submodules: false
 
             - name: Checkout godot-cpp
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   repository: godotengine/godot-cpp
                   path: godot-cpp
                   submodules: recursive
+                  ref: "54136ee8357c5140a3775c54f08db5f7deda2058"
 
             - name: Checkout private EOS SDK mirror repo
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   token: "${{secrets.EOS_SDK_MIRROR_PAT}}"
                   repository: 3ddelano/eos-sdk-mirror
@@ -120,7 +135,7 @@ jobs:
                   link-to-sdk: true
 
             - name: Setup build cache
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                   path: ${{ github.workspace }}/.scons-cache/
                   key: ${{ matrix.identifier }}
@@ -158,10 +173,18 @@ jobs:
               run: |
                   Remove-Item ${{ github.workspace }}/artifact/${{ github.event.repository.name }}/addons/epic-online-services-godot/bin/windows/* -Include *.exp,*.lib,*.ilk -Force
 
+            - name: Upload artifact ${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.arch }}
+              uses: actions/upload-artifact@v3
+              with:
+                  name: ${{ github.event.repository.name }}-${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.arch }}-${{ github.sha }}
+                  path: |
+                      ${{ github.workspace }}/${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.arch }}/artifact/
+                  retention-days: 14
+
             - name: Upload artifact
               uses: actions/upload-artifact@v3
               with:
-                  name: ${{ github.event.repository.name }}-${{ github.sha }}
+                  name: ${{ github.event.repository.name }}-all${{ github.sha }}
                   path: |
                       ${{ github.workspace }}/artifact/
                   retention-days: 14
diff --git a/sample/addons/epic-online-services-godot/eosg.gdextension b/sample/addons/epic-online-services-godot/eosg.gdextension
@@ -10,9 +10,9 @@ windows.x86_64.debug = "bin/windows/libeosg.windows.template_debug.dev.x86_64.dl
 windows.x86_64.release = "bin/windows/libeosg.windows.template_release.x86_64.dll"
 macos.debug = "bin/macos/libeosg.macos.template_debug.framework"
 macos.release = "bin/macos/libeosg.macos.template_release.framework"
-android.debug.arm64 = "bin/android/libeosg.android.template_debug.arm64.so"
+android.debug.arm64 = "bin/android/libeosg.android.template_debug.dev.arm64.so"
 android.release.arm64 = "bin/android/libeosg.android.template_release.arm64.so"
-android.debug.x86_64 = "bin/android/libeosg.android.template_debug.x86_64.so"
+android.debug.x86_64 = "bin/android/libeosg.android.template_debug.dev.x86_64.so"
 android.release.x86_64 = "bin/android/libeosg.android.template_release.x86_64.so"
 
 [dependencies]