fix(bundler): linux aarch64 build

libnyanpasu · Sep 10, 2024 · 974f631 · 974f631
1 parent a44f875
commit 974f631
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 62 deletions.
diff --git a/.github/workflows/target-dev-build.yaml b/.github/workflows/target-dev-build.yaml
@@ -36,15 +36,15 @@ jobs:
       tag: "pre-release"
     secrets: inherit
 
-  # linux_aarch64_build:
-  #   name: Linux aarch64 Build
-  #   uses: ./.github/workflows/deps-build-linux.yaml
-  #   needs: [delete_current_releases]
-  #   with:
-  #     nightly: true
-  #     tag: "pre-release"
-  #     aarch64: true
-  #   secrets: inherit
+  linux_aarch64_build:
+    name: Linux aarch64 Build
+    uses: ./.github/workflows/deps-build-linux.yaml
+    needs: [delete_current_releases]
+    with:
+      nightly: true
+      tag: "pre-release"
+      aarch64: true
+    secrets: inherit
 
   macos_amd64_build:
     name: macOS amd64 Build
@@ -71,7 +71,7 @@ jobs:
     needs: [
         windows_build,
         linux_amd64_build,
-        # linux_aarch64_build,
+        linux_aarch64_build,
         macos_amd64_build,
         macos_aarch64_build,
       ]

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/Cross.toml b/backend/Cross.toml
@@ -1,16 +1,25 @@
 [target.aarch64-unknown-linux-gnu]
-image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:edge"
-pre-build = [
-  "dpkg --add-architecture $CROSS_DEB_ARCH",
-  """apt-get update && apt-get -y install \
-    libwebkit2gtk-4.1-dev:$CROSS_DEB_ARCH \
-    libxdo-dev:$CROSS_DEB_ARCH \
-    libayatana-appindicator3-dev:$CROSS_DEB_ARCH \
-    librsvg2-dev:$CROSS_DEB_ARCH \
-    libpango1.0-dev:$CROSS_DEB_ARCH \
-    libcairo2-dev:$CROSS_DEB_ARCH \
-    libatk1.0-dev:$CROSS_DEB_ARCH \
-    libsoup2.4-dev:$CROSS_DEB_ARCH \
-    libssl-dev:$CROSS_DEB_ARCH
-  """,
-]
+# dockerfile = "./manifest/docker/ubuntu-22.04-aarch64/Dockerfile"
+image = "ghcr.io/libnyanpasu/builder-ubuntu-22.04-aarch64:latest"
+# pre-build = [
+#   "dpkg --add-architecture $CROSS_DEB_ARCH",
+#   """echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse" | tee /etc/apt/sources.list && \
+#     echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list && \
+#     echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list && \
+#     echo "deb [arch=i386,amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list && \
+#     echo "deb [arch=i386,amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list && \
+#     echo "deb [arch=i386,amd64] http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse" | tee -a /etc/apt/sources.list && \
+#     apt-get update && apt-get -y install \
+#     build-essential \
+#     libgtk-3-dev:$CROSS_DEB_ARCH \
+#     libwebkit2gtk-4.1-dev:$CROSS_DEB_ARCH \
+#     libxdo-dev:$CROSS_DEB_ARCH \
+#     libayatana-appindicator3-dev:$CROSS_DEB_ARCH \
+#     librsvg2-dev:$CROSS_DEB_ARCH \
+#     libpango1.0-dev:$CROSS_DEB_ARCH \
+#     libcairo2-dev:$CROSS_DEB_ARCH \
+#     libatk1.0-dev:$CROSS_DEB_ARCH \
+#     libsoup2.4-dev:$CROSS_DEB_ARCH \
+#     libssl-dev:$CROSS_DEB_ARCH \
+#   """,
+# ]
diff --git a/backend/tauri/build.rs b/backend/tauri/build.rs
@@ -11,11 +11,6 @@ struct PackageJson {
     version: String, // we only need the version
 }
 
-#[derive(Deserialize)]
-struct TauriJson {
-    package: PackageJson,
-}
-
 #[derive(Deserialize)]
 struct GitInfo {
     hash: String,
@@ -30,8 +25,8 @@ fn main() {
         pkg_json.version
     } else {
         let mut raw = read("./tauri.conf.json").unwrap(); // TODO: fix it when windows arm64 need it
-        let tauri_json: TauriJson = simd_json::from_slice(&mut raw).unwrap();
-        tauri_json.package.version
+        let tauri_json: PackageJson = simd_json::from_slice(&mut raw).unwrap();
+        tauri_json.version
     };
     let version = semver::Version::parse(&version).unwrap();
     let is_prerelase = !version.pre.is_empty();

diff --git a/frontend/nyanpasu/src/router.ts b/frontend/nyanpasu/src/router.ts
@@ -1,7 +1,7 @@
 // Generouted, changes to this file will be overriden
 /* eslint-disable */
 
-import { components, hooks, utils } from "@generouted/react-router/client";
+import { components, hooks, utils } from '@generouted/react-router/client'
 
 export type Path =
   | `/`
@@ -12,16 +12,14 @@ export type Path =
   | `/providers`
   | `/proxies`
   | `/rules`
-  | `/settings`;
+  | `/settings`
 
-export type Params = {};
+export type Params = {
+
+}
 
-export type ModalPath = never;
+export type ModalPath = never
 
-export const { Link, Navigate } = components<Path, Params>();
-export const { useModals, useNavigate, useParams } = hooks<
-  Path,
-  Params,
-  ModalPath
->();
-export const { redirect } = utils<Path, Params>();
+export const { Link, Navigate } = components<Path, Params>()
+export const { useModals, useNavigate, useParams } = hooks<Path, Params, ModalPath>()
+export const { redirect } = utils<Path, Params>()