From 98e5b7c28c89d3ca22d99c75e1aa603e7ee1624f Mon Sep 17 00:00:00 2001
From: dabao1955 <dabao1955@163.com>
Date: Mon, 3 Feb 2025 12:44:02 +0800
Subject: [PATCH 1/2] ci: switch to arm64 native build

---
 .github/workflows/build-terre.yml | 75 ++-----------------------------
 1 file changed, 3 insertions(+), 72 deletions(-)

diff --git a/.github/workflows/build-terre.yml b/.github/workflows/build-terre.yml
index 98c236f06..28a416cd2 100644
--- a/.github/workflows/build-terre.yml
+++ b/.github/workflows/build-terre.yml
@@ -36,7 +36,7 @@ jobs:
           path: release/WebGAL_Terre_Linux.zip
   build-arm64:
     name: Build Linux ARM64 Binary
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -45,79 +45,10 @@ jobs:
         with:
           node-version-file: package.json
           cache: 'yarn'
-      - name: Build Stage 1
-        run: |
-          echo "Welcome to build WebGAL Terre, the editor of WebGAL platform."
-          # 安装依赖
-          yarn install --frozen-lockfile
-          # 清理
-          test -d release && rm -rf release
-          mkdir release
-          # 进入 Terre 目录
-          cd packages/terre2
-          yarn run build
-      - name: Build pkg ARM64
-        uses: pguyot/arm-runner-action@v2
-        with:
-          base_image: raspios_lite_arm64:latest
-          bind_mount_repository: true
-          commands: |
-            apt-get update
-            apt-get install -y curl sudo
-            # Install Node.js v18.x
-            curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
-            apt-get install -y nodejs
-            # Enable yarn
-            corepack prepare yarn@1.22.19 --activate
-            corepack enable yarn
-            cd packages/terre2
-            yarn run pkg:linux-arm64
-      - name: Build Stage 2
+      - name: Build
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: |
-          sudo chmod 777 -R .
-          cd packages/terre2/dist
-          cp -r WebGAL_Terre  ../../../release
-          rm WebGAL_Terre
-          cd ../
-          mkdir Exported_Games
-          cp -r public assets Exported_Games ../../release
-          cd ../../
-          # 进入 Origine 目录
-          cd packages/origine2
-          # 低内存，使用下一行限制内存使用
-          # export NODE_OPTIONS=--max_old_space_size=512000
-          yarn run build
-          cp -rf dist/* ../../release/public/
-          cd ../../
-          # 进入 Electron 目录
-          cd packages/WebGAL-electron
-          yarn install --frozen-lockfile
-          yarn run build:arm64
-          mkdir ../../release/assets/templates/WebGAL_Electron_Template
-          cp -rf build/linux-arm64-unpacked/* ../../release/assets/templates/WebGAL_Electron_Template/
-          cd ../../
-          # 克隆 WebGAL Android 模板
-          cd release/assets/templates/
-          git clone https://github.com/nini22P/WebGAL-Android.git
-          mv WebGAL-Android WebGAL_Android_Template
-          # MainActivity.kt 移动到主文件夹防止误删
-          mv WebGAL_Android_Template/app/src/main/java/com/openwebgal/demo/MainActivity.kt WebGAL_Android_Template/app/src/main/java/MainActivity.kt
-          cd ../../../
-          cd release
-          # 删除冗余文件
-          rm -rf Exported_Games/*
-          rm -rf public/games/*
-          rm -rf public/games/.gitkeep
-          rm -rf assets/templates/WebGAL_Template/game/video/*
-          rm -rf assets/templates/WebGAL_Template/game/video/.gitkeep
-          rm -rf assets/templates/WebGAL_Android_Template/.github
-          rm -rf assets/templates/WebGAL_Android_Template/.git
-          rm -rf assets/templates/WebGAL_Android_Template/.gitattributes
-          rm -rf assets/templates/WebGAL_Android_Template/app/src/main/assets/webgal/.gitkeep
-          rm -rf assets/templates/WebGAL_Android_Template/app/src/main/java/com
-          echo "WebGAL Terre is now ready to be deployed."
+        run: sh release-linux.sh         
       - name: Compress
         run: 7z a -tzip release/WebGAL_Terre_Linux_Arm64.zip release/*
       

From ea81321d8148eac3c8ecff9baa68eb7fcb0bd6c9 Mon Sep 17 00:00:00 2001
From: dabao1955 <dabao1955@163.com>
Date: Mon, 3 Feb 2025 12:50:29 +0800
Subject: [PATCH 2/2] Update build-terre.yml

---
 .github/workflows/build-terre.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-terre.yml b/.github/workflows/build-terre.yml
index 28a416cd2..7031bae53 100644
--- a/.github/workflows/build-terre.yml
+++ b/.github/workflows/build-terre.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Build
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: sh release-linux.sh         
+        run: sh release-linux-arm64.sh         
       - name: Compress
         run: 7z a -tzip release/WebGAL_Terre_Linux_Arm64.zip release/*