From e1d61f42122a7b38235db9af8e2c7f4d6ac43b7a Mon Sep 17 00:00:00 2001
From: HuanCheng65 <609486518@qq.com>
Date: Sun, 6 Feb 2022 20:20:55 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .circleci/config.yml | 46 +++++++++++++-------------------------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b3151cb..55503642 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,49 +42,29 @@ jobs:
       - store_artifacts:
           path: app/build/outputs/mapping/release/
           destination: mapping/
-
-  upload_apk:
-    working_directory: ~/code/app/build/outputs/apk/release
-
-    docker:
-      - image: circleci/android:api-30-ndk
-
-    environment:
-      JVM_OPTS: -Xmx4G
-
-    steps:
       - run:
           name: Define Environment Variable at Runtime
           command: |
-            echo "export APP_VERSION_NAME=\$(cat output-metadata.json | jq '.elements[0].versionName' | awk -F '\"' '{print \$2}')" >> $BASH_ENV
-            echo "export APP_OUTPUT_FILE=\$(cat output-metadata.json | jq '.elements[0].outputFile' | awk -F '\"' '{print \$2}')" >> $BASH_ENV
-            echo "export APP_VERSION_CODE=\$(cat output-metadata.json | jq '.elements[0].versionCode'" >> $BASH_ENV
+            echo "export APP_VERSION_NAME=\$(cat ./app/build/outputs/apk/release/output-metadata.json | jq '.elements[0].versionName' | awk -F '\"' '{print \$2}')" >> $BASH_ENV
+            echo "export APP_OUTPUT_FILE=\$(cat ./app/build/outputs/apk/release/output-metadata.json | jq '.elements[0].outputFile' | awk -F '\"' '{print \$2}')" >> $BASH_ENV
+            echo "export APP_VERSION_CODE=\$(cat ./app/build/outputs/apk/release/output-metadata.json | jq '.elements[0].versionCode'" >> $BASH_ENV
             source $BASH_ENV
-      - publish:
+
+workflows:
+  version: 2
+  build_and_upload:
+    jobs:
+      - build
+      - app-center/publish:
+          working_directory: ~/code/app/build/outputs/apk/release
           name: Publish to App Center
           group: HuanCheng65
           file: $APP_OUTPUT_FILE
           app: TiebaLite
           token: $APP_CENTER_TOKEN
           notes: $APP_VERSION_NAME
-
-  upload_mapping:
-    working_directory: ~/code/app/build/outputs/mapping/release
-
-    docker:
-      - image: circleci/android:api-30-ndk
-
-    environment:
-      JVM_OPTS: -Xmx4G
-
-    steps:
-      - run:
-          name: Define Environment Variable at Runtime
-          command: |
-            echo "export APP_VERSION_NAME=\$(cat output-metadata.json | jq '.elements[0].versionName' | awk -F '\"' '{print \$2}')" >> $BASH_ENV
-            echo "export APP_VERSION_CODE=\$(cat output-metadata.json | jq '.elements[0].versionCode'" >> $BASH_ENV
-            source $BASH_ENV
-      - mapping:
+      - app-center/mapping:
+          working_directory: ~/code/app/build/outputs/mapping/release
           name: Upload to App Center
           file: mapping.txt
           app: TiebaLite