Unify bits, android_arch, macos_arch ios_arch into arch, support non-x86

Unify arguments and add support for ARM64 and RV64 Linux
godotengine · May 14, 2022 · b3b80b1 · b3b80b1
1 parent f9f6767
commit b3b80b1
Show file tree

Hide file tree

Showing 4 changed files with 253 additions and 182 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,27 +21,27 @@ jobs:
           sudo apt-get update -qq
           sudo apt-get install -qqq build-essential pkg-config
           python -m pip install scons
-          curl -LO https://downloads.tuxfamily.org/godotengine/3.4/Godot_v3.4-stable_linux_server.64.zip
-          unzip Godot_v3.4-stable_linux_server.64.zip
+          curl -LO https://downloads.tuxfamily.org/godotengine/3.5/beta5/Godot_v3.5-beta5_linux_server.64.zip
+          unzip Godot_v3.5-beta5_linux_server.64.zip
 
       - name: Build godot-cpp
         run: |
-          scons target=release generate_bindings=yes -j $(nproc)
+          scons target=release platform=linux arch=x86_64 generate_bindings=yes -j $(nproc)
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
           name: godot-cpp-linux-glibc2.27-x86_64-release
-          path: bin/libgodot-cpp.linux.release.64.a
+          path: bin/libgodot-cpp.linux.release.x86_64.a
           if-no-files-found: error
 
       - name: Build test GDNative library
         run: |
-          scons target=release platform=linux bits=64 -j $(nproc) -C test
+          scons target=release platform=linux arch=x86_64 -j $(nproc) -C test
 
       - name: Run test GDNative library
         run: |
-          ./Godot_v3.4-stable_linux_server.64 --path test -s script.gd
+          ./Godot_v3.5-beta5_linux_server.64 --path test -s script.gd
 
   windows-msvc:
     name: Build (Windows, MSVC)
@@ -69,7 +69,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: godot-cpp-windows-msvc2019-x86_64-release
-          path: bin/libgodot-cpp.windows.release.64.lib
+          path: bin/libgodot-cpp.windows.release.x86_64.lib
           if-no-files-found: error
 
   windows-mingw:
@@ -101,7 +101,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: godot-cpp-linux-mingw-x86_64-release
-          path: bin/libgodot-cpp.windows.release.64.a
+          path: bin/libgodot-cpp.windows.release.x86_64.a
           if-no-files-found: error
 
   macos:
@@ -121,23 +121,23 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install scons
-          curl -LO https://downloads.tuxfamily.org/godotengine/3.4/Godot_v3.4-stable_osx.universal.zip
-          unzip Godot_v3.4-stable_osx.universal.zip
+          curl -LO https://downloads.tuxfamily.org/godotengine/3.5/beta5/Godot_v3.5-beta5_osx.universal.zip
+          unzip Godot_v3.5-beta5_osx.universal.zip
 
       - name: Build godot-cpp
         run: |
-          scons target=release generate_bindings=yes -j $(sysctl -n hw.logicalcpu)
+          scons target=release platform=osx arch=universal -j $(sysctl -n hw.logicalcpu) generate_bindings=yes
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
           name: godot-cpp-macos-universal-release
-          path: bin/libgodot-cpp.osx.release.64.a
+          path: bin/libgodot-cpp.osx.release.universal.a
           if-no-files-found: error
 
       - name: Build test GDNative library
         run: |
-          scons target=release platform=osx bits=64 macos_arch=universal -j $(sysctl -n hw.logicalcpu) -C test
+          scons target=release platform=osx arch=universal -j $(sysctl -n hw.logicalcpu) -C test
 
       - name: Run test GDNative library
         run: |