diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1af3a3a..a1f1631 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,7 +141,7 @@ jobs: ANDROID_NDK_HOME: ${{ env.ANDROID_NDK_HOME }} GOPRIVATE: github.com/oneclickvirt/security run: | - fyne package --os android --app-id com.oneclickvirt.goecs --app-version "${{ needs.prepare.outputs.app_version }}" --tags fyne_mobile + fyne package --os android --app-id com.oneclickvirt.goecs --app-version "${{ needs.prepare.outputs.app_version }}" if [ -f *.apk ]; then mkdir -p .build mv *.apk .build/goecs-gui-android-arm64-${{ needs.prepare.outputs.version }}.apk @@ -156,7 +156,7 @@ jobs: ANDROID_NDK_HOME: ${{ env.ANDROID_NDK_HOME }} GOPRIVATE: github.com/oneclickvirt/security run: | - fyne package --os android/amd64 --app-id com.oneclickvirt.goecs --app-version "${{ needs.prepare.outputs.app_version }}" --tags fyne_mobile + fyne package --os android/amd64 --app-id com.oneclickvirt.goecs --app-version "${{ needs.prepare.outputs.app_version }}" if [ -f *.apk ]; then mv *.apk .build/goecs-gui-android-x86_64-${{ needs.prepare.outputs.version }}.apk echo "x86_64 APK 构建成功" diff --git a/embedding/embed_android_amd64.go b/embedding/embed_android_amd64.go index bce42d0..958e540 100644 --- a/embedding/embed_android_amd64.go +++ b/embedding/embed_android_amd64.go @@ -1,4 +1,4 @@ -//go:build android && amd64 +//go:build !windows && !darwin && !linux && amd64 package embedding diff --git a/embedding/embed_android_arm.go b/embedding/embed_android_arm.go index f771456..ee53fe4 100644 --- a/embedding/embed_android_arm.go +++ b/embedding/embed_android_arm.go @@ -1,4 +1,4 @@ -//go:build android && arm +//go:build !windows && !darwin && !linux && arm package embedding diff --git a/embedding/embed_android_arm64.go b/embedding/embed_android_arm64.go index 3fe7994..f9181b2 100644 --- a/embedding/embed_android_arm64.go +++ b/embedding/embed_android_arm64.go @@ -1,4 +1,4 @@ -//go:build android && arm64 +//go:build !windows && !darwin && !linux && arm64 package embedding diff --git a/embedding/embed_mobile_amd64.go b/embedding/embed_mobile_amd64.go deleted file mode 100644 index 7b9e7e8..0000000 --- a/embedding/embed_mobile_amd64.go +++ /dev/null @@ -1,42 +0,0 @@ -//go:build fyne_mobile && amd64 - -package embedding - -import ( - _ "embed" - "fmt" - "os" - "path/filepath" -) - -//go:embed binaries/goecs-linux-amd64 -var ecsBinary []byte - -func getECSBinary() ([]byte, error) { - if len(ecsBinary) == 0 { - return nil, fmt.Errorf("Mobile AMD64 二进制文件未嵌入") - } - return ecsBinary, nil -} - -func ExtractECSBinary() (string, error) { - binary, err := getECSBinary() - if err != nil { - return "", err - } - - tmpDir := os.TempDir() - ecsPath := filepath.Join(tmpDir, "goecs") - - if err := os.WriteFile(ecsPath, binary, 0755); err != nil { - return "", fmt.Errorf("写入二进制文件失败: %v", err) - } - - return ecsPath, nil -} - -func CleanupECSBinary(path string) { - if path != "" { - os.Remove(path) - } -} diff --git a/embedding/embed_mobile_arm64.go b/embedding/embed_mobile_arm64.go deleted file mode 100644 index 234e918..0000000 --- a/embedding/embed_mobile_arm64.go +++ /dev/null @@ -1,42 +0,0 @@ -//go:build fyne_mobile && arm64 - -package embedding - -import ( - _ "embed" - "fmt" - "os" - "path/filepath" -) - -//go:embed binaries/goecs-linux-arm64 -var ecsBinary []byte - -func getECSBinary() ([]byte, error) { - if len(ecsBinary) == 0 { - return nil, fmt.Errorf("Mobile ARM64 二进制文件未嵌入") - } - return ecsBinary, nil -} - -func ExtractECSBinary() (string, error) { - binary, err := getECSBinary() - if err != nil { - return "", err - } - - tmpDir := os.TempDir() - ecsPath := filepath.Join(tmpDir, "goecs") - - if err := os.WriteFile(ecsPath, binary, 0755); err != nil { - return "", fmt.Errorf("写入二进制文件失败: %v", err) - } - - return ecsPath, nil -} - -func CleanupECSBinary(path string) { - if path != "" { - os.Remove(path) - } -}