attempt to fix cross

GlobedGD · Nov 22, 2024 · 938ac70 · 938ac70
1 parent 765137f
commit 938ac70
Show file tree

Hide file tree

Showing 15 changed files with 157 additions and 6 deletions.
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -64,8 +64,8 @@ jobs:
       - name: Build central server (native)
         if: matrix.target != 'aarch64-unknown-linux-gnu'
         run: |
-          cd server
-          cargo build --release --target ${{ matrix.target }} -p globed-central-server
+          cd server/central
+          SQLX_OFFLINE=true cargo build --release --target ${{ matrix.target }}
         env:
           CARGO_NET_GIT_FETCH_WITH_CLI: true
 

diff --git a/server/Cross.toml b/server/Cross.toml
@@ -1,5 +1,6 @@
 [target.aarch64-unknown-linux-gnu]
 pre-build = [
+    "export SQLX_OFFLINE=true",
     "dpkg --add-architecture $CROSS_DEB_ARCH",
     "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH",
 ]
diff --git a/...central/.sqlx/query-02fa43600c4eff4f86ddbc97992d88c790e4d1591c109fea75e876ec0985a636.json b/...central/.sqlx/query-02fa43600c4eff4f86ddbc97992d88c790e4d1591c109fea75e876ec0985a636.json
diff --git a/...central/.sqlx/query-1ff089a40bff1d9a3ddcc0749213c5bf5b5188bc1dcc59cf82ce48e545d5b202.json b/...central/.sqlx/query-1ff089a40bff1d9a3ddcc0749213c5bf5b5188bc1dcc59cf82ce48e545d5b202.json
diff --git a/...central/.sqlx/query-376106953cd01f83c2b238bf4fc8366f1eeb4092c19b9d26d36a64bfa1699f09.json b/...central/.sqlx/query-376106953cd01f83c2b238bf4fc8366f1eeb4092c19b9d26d36a64bfa1699f09.json
diff --git a/...central/.sqlx/query-4337dcb463e9d99e77db62fccb0a195453bfbe65cb946cd8947d258bbdc211a2.json b/...central/.sqlx/query-4337dcb463e9d99e77db62fccb0a195453bfbe65cb946cd8947d258bbdc211a2.json
diff --git a/...central/.sqlx/query-4baf83134ee0bba1b75ef59967b2f3f2c76702a2b652c1117dbf26a7e87a145c.json b/...central/.sqlx/query-4baf83134ee0bba1b75ef59967b2f3f2c76702a2b652c1117dbf26a7e87a145c.json
diff --git a/...central/.sqlx/query-6a88f2c9a00b65da29e7d1d9ae619559d6b3a7c1129a958c63cd01cbde85d92a.json b/...central/.sqlx/query-6a88f2c9a00b65da29e7d1d9ae619559d6b3a7c1129a958c63cd01cbde85d92a.json
diff --git a/...central/.sqlx/query-895e830e224326e0e5ef6bfc270fdb1de0bee79e44a3abf777f24dc0c109f6ce.json b/...central/.sqlx/query-895e830e224326e0e5ef6bfc270fdb1de0bee79e44a3abf777f24dc0c109f6ce.json
diff --git a/...central/.sqlx/query-a5d1f830c3e857f94bcaf864f8ec46156940b543d9eac2fb849db447bf70e1c7.json b/...central/.sqlx/query-a5d1f830c3e857f94bcaf864f8ec46156940b543d9eac2fb849db447bf70e1c7.json
diff --git a/...central/.sqlx/query-ac970b41481290e1551ef4583b4ff9dff12b8af3b967fde7d25b365913d8a38b.json b/...central/.sqlx/query-ac970b41481290e1551ef4583b4ff9dff12b8af3b967fde7d25b365913d8a38b.json
diff --git a/...central/.sqlx/query-cf94857754d165844cbf1152671470873eca6efbd365fc0d9bb18526b03376ba.json b/...central/.sqlx/query-cf94857754d165844cbf1152671470873eca6efbd365fc0d9bb18526b03376ba.json
diff --git a/...central/.sqlx/query-f5d8599ac03d46ece0e7521bb7fc8582c892d97cbbe2d00d1adc94f98e4dde4b.json b/...central/.sqlx/query-f5d8599ac03d46ece0e7521bb7fc8582c892d97cbbe2d00d1adc94f98e4dde4b.json
diff --git a/...central/.sqlx/query-f965a50418d0ec1f71c3fea4a82f5e2b2084855e6f390c2479eba67b80282cee.json b/...central/.sqlx/query-f965a50418d0ec1f71c3fea4a82f5e2b2084855e6f390c2479eba67b80282cee.json
diff --git a/server/central/build.rs b/server/central/build.rs
@@ -1,8 +1,6 @@
-// generated by `sqlx migrate build-script`
+use std::env;
+
 fn main() {
     // trigger recompilation when a new migration is added
     println!("cargo:rerun-if-changed=migrations");
-
-    // set SQLX_OFFLINE to 1
-    println!("cargo:rustc-env=SQLX_OFFLINE=1");
 }