From 1fc5975e7656a690f3a16096df3101f73b3ea8b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@nekox.me>
Date: Fri, 26 Feb 2021 14:08:07 +0800
Subject: [PATCH] Fix workflow

---
 .github/workflows/release.yml | 34 ++++++++++++++++++++++++++++++----
 bin/libs/v2ray.sh             |  3 ++-
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ef6318b78..7826e855f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -257,7 +257,6 @@ jobs:
           git submodule status ss-rust/src/main/rust/shadowsocks-rust > shadowsocks_status
           git submodule status 'ssr-libev/*' > shadowsocksr_status
       - name: Native Cache
-        id: cache
         uses: actions/cache@v2
         with:
           path: |
@@ -357,19 +356,46 @@ jobs:
     name: Publish to Play Store
     if: github.event.inputs.play != 'y'
     runs-on: ubuntu-latest
-    needs: native
+    needs:
+      - native
+      - v2ray
+      - shadowsocks
+      - shadowsocksr
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup Android SDK Tools
         uses: android-actions/setup-android@v2
+      - name: Fetch Status
+        run: |
+          git submodule status TMessagesProj/jni/ffmpeg > ffmpeg_status
+          git submodule status TMessagesProj/jni/boringssl > boringssl_status
+          git submodule status ss-rust/src/main/rust/shadowsocks-rust > shadowsocks_status
+          git submodule status 'ssr-libev/*' > shadowsocksr_status
       - name: Native Cache
         uses: actions/cache@v2
         with:
           path: |
-            TMessagesProj/libs
             TMessagesProj/src/main/libs
-          key: ${{ hashFiles('TMessagesProj/jni/**', 'ss-rust/src/main/rust/**') }}
+          key: ${{ hashFiles('TMessagesProj/jni/**', 'ffmpeg_status', 'boringssl_status') }}
+      - name: V2ray Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            TMessagesProj/libs/libv2ray.aar
+          key: ${{ hashFiles('bin/libs/v2ray.sh') }}
+      - name: Shadowsocks Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            TMessagesProj/libs/ss-rust-release.aar
+          key: ${{ hashFiles('shadowsocks_status') }}
+      - name: ShadowsocksR Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            TMessagesProj/libs/ssr-libev-release.aar
+          key: ${{ hashFiles('shadowsocksr_status') }}
       - name: Fix Gradle Memoery
         run: |
           sed -i -e "s/16384/6144/g" gradle.properties
diff --git a/bin/libs/v2ray.sh b/bin/libs/v2ray.sh
index 9617df3eb..8a2af16d8 100755
--- a/bin/libs/v2ray.sh
+++ b/bin/libs/v2ray.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 
-// v4.34.0
+# v4.34.0
 V2RAY_CORE_VERSION="a6efb4d60b86789a68ed8ac8d52cfcec2d80229a"
 
 source "bin/init/env.sh"
 export GO111MOUDLE=on
 export PATH="$PATH:$(go env GOPATH)/bin"
 
+mkdir -p "$PROJECT/build"
 cd "$PROJECT/build"
 [ -d "v2ray" ] || git clone https://github.com/2dust/AndroidLibV2rayLite v2ray || exit 1
 cd v2ray