fix: build mini

.github/workflows/alpha.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    environment: koyeb
+    environment: mini
     env:
       # this will take the entire vars context configured in the repository > environments
       # setting and convert it to JSON so we can automatically assign all the values to the
@@ -25,10 +25,13 @@ jobs:
           distribution: 'temurin'
           cache: gradle
 
-      - name: Build app
-        run: ./scripts/build_scripts/build-service-on-ci.sh koyeb
+      - name: Build mini service
+        run: ./scripts/build_scripts/build-service-on-ci.sh
+
+      - name: Build koyeb app
+        run: ./scripts/build_scripts/build-app-on-ci.sh https://respectable-jobie-anabn-3d54150c.koyeb.app/server/ koyeb
 
       - uses: actions/upload-artifact@v4
         with:
-          name: Signed app bundle
+          name: Signed A Bundle
           path: build/outputs/apk/release/

deploy/docker-compose.prebuild.yml

@@ -1,6 +1,7 @@
 services:
   server:
     image: a-server:latest
+    build: !reset null
     ports:
       - ${SERVER_PORT}:${SERVER_PORT}
     profiles:

deploy/docker-compose.yml

@@ -41,7 +41,8 @@ services:
         IS_PROD: ${IS_PROD}
         FLAVOR: ${FLAVOR}
         IS_HOST: false
-        BUILD_ON_HOST: ${BUILD_ON_HOST}
+        BUILD_ON_LOCAL_HOST: ${BUILD_ON_LOCAL_HOST}
+        BUILD_ON_REMOTE_HOST: ${BUILD_ON_REMOTE_HOST}
         BUILD_ON_DOCKER: ${BUILD_ON_DOCKER}
     ports:
       - ${SERVER_PORT}:${SERVER_PORT}

scripts/build_scripts/build-app-on-ci.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+URL=$1
+FLAVOR=$2
+FLAVOR="g-$FLAVOR"
+IS_PROD="true"
+
+# 自动根据系统环境设置换行符格式
+use_windows_newline=false
+
+# 检测操作系统
+if [[ "$(uname -s)" =~ MINGW|CYGWIN|MSYS ]]; then
+  use_windows_newline=true
+fi
+
+# 设置换行符变量
+newline="\n"
+
+if [ "$use_windows_newline" = true ]; then
+  newline="\r\n"
+fi
+
+cat > "./$FLAVOR.env" <<EOF
+SERVER_URL=${URL}${newline}
+WS_SERVER_URL=${URL}${newline}
+EOF
+
+./scripts/tool_scripts/modify-flavor.sh "$FLAVOR" "$IS_PROD"
+
+sh gradlew composeApp:build
+
+mkdir -p "build/outputs/apk/release"
+
+mv composeApp/build/outputs/apk/release/*.apk "build/outputs/apk/release/$FLAVOR.apk"

scripts/build_scripts/build-server-docker-image.sh

@@ -8,7 +8,8 @@ fi
 
 IS_HOST=true \
   IS_DOCKER=false \
-  BUILD_ON_HOST=true \
+  BUILD_ON_LOCAL_HOST=true \
+  BUILD_ON_REMOTE_HOST=false \
   BUILD_ON_DOCKER=false \
   ./scripts/build_scripts/build-all-in-flavor.sh alpha true
 docker build -t "$DOCKER_IMAGE_NAME" .

scripts/service_scripts/build-service.sh

@@ -42,6 +42,6 @@ else
   IS_DOCKER=false \
     ./scripts/build_scripts/build-all-in-flavor.sh "$FLAVOR" true
   args=$(grep -v '^#' "$FLAVOR".env | grep -v '^$' | awk -F '=' '{print "--build-arg " $1 "=\"" $2 "\""}' ORS=' ')
-  ./scripts/tool_scripts/exec-until-success.sh docker build "$args" -t "a-server:latest" .
+  ./scripts/tool_scripts/exec-until-success.sh docker build --platform linux/amd64 "$args" -t "a-server:latest" .
   ./scripts/service_scripts/start-service-on-remote.sh "$PUSH_TO_REMOTE_URI" "$REMOTE_CERT_FILE" "$REMOTE_COMMAND $FLAVOR"
 fi

scripts/service_scripts/start-mini-compose.sh

@@ -6,7 +6,7 @@ if [ "$USE_PREBUILD" = "true" ]; then
      docker compose --env-file ../mini.env \
           -f docker-compose.yml \
           -f docker-compose.d.yml \
-          -f docker-compose.prebuild.yml
+          -f docker-compose.prebuild.yml \
           up -d --build
 else
      docker compose --env-file ../mini.env \

scripts/service_scripts/start-service-in-flavor.sh

@@ -7,4 +7,4 @@ if [ -z "$FLAVOR" ]; then
   exit 1
 fi
 
-sh "scripts/service_scripts/build-service.sh $FLAVOR"
+"./scripts/service_scripts/build-service.sh $FLAVOR"

scripts/service_scripts/start-service-on-remote.sh

@@ -10,6 +10,7 @@ fi
 
 # 定义要保存的文件名
 FILE="build/images/$FLAVOR.image.tar"
+mkdir -p build/images
 IMAGE_NAME="a-server:latest"
 
 # 检查文件是否存在

scripts/tool_scripts/push-env-to-github.sh

@@ -23,7 +23,7 @@ fi
 if [ "$(gh api \
   -H "Accept: application/vnd.github+json" \
   -H "X-GitHub-Api-Version: 2022-11-28" \
-  /repos/storytellerF/A/environments/koyeb \
+  "/repos/storytellerF/A/environments/$FLAVOR" \
   -q ".name")" != "$ENVIRONMENT" ]; then
 
   echo "Environment '$ENVIRONMENT' does not exist."