3.0.0

217heidai · Oct 12, 2021 · 198ad34 · 198ad34
1 parent c669b20
commit 198ad34
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 67 deletions.
diff --git a/.github/workflows/build_armeabi-v7a.yml b/.github/workflows/build_armeabi-v7a.yml
@@ -50,7 +50,6 @@ jobs:
         id: compile
         if: steps.download_ndk.outputs.status == 'success' && steps.download_openssl.outputs.status == 'success' && !cancelled()
         run: |
-          rm -rf build
           mkdir build
           bash ./openssl_build_${{env.ANDROID_ABI}}.sh
           echo "::set-output name=status::success"

diff --git a/.github/workflows/build_armeabi.yml b/.github/workflows/build_armeabi.yml
@@ -10,8 +10,8 @@ on:
 
 env:
   ANDROID_ABI: armeabi
-  OPENSSL_VERSION: 3_0_0
-  VERSION: 3.0.0
+  OPENSSL_VERSION: 3.0.0
+  ANDROID_NDK_VERSION: r19c
   WORK_PATH: /home/runner/work/openssl_for_android/openssl_for_android
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
@@ -35,31 +35,30 @@ jobs:
       - name: Download Android NDK
         id: download_ndk
         run: |
-          aria2c https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip
-          unzip android-ndk-r14b-linux-x86_64.zip
+          aria2c https://dl.google.com/android/repository/android-ndk-${{env.ANDROID_NDK_VERSION}}-linux-x86_64.zip
+          unzip android-ndk-${{env.ANDROID_NDK_VERSION}}-linux-x86_64.zip
           echo "::set-output name=status::success"
 
       - name: Download OpenSSL
         id: download_openssl
         run: |
-          aria2c https://codeload.github.com/openssl/openssl/zip/OpenSSL_${{env.OPENSSL_VERSION}}
-          unzip openssl-OpenSSL_${{env.OPENSSL_VERSION}}.zip
+          aria2c https://www.openssl.org/source/openssl-${{env.OPENSSL_VERSION}}.tar.gz
+          tar -zxvf openssl-${{env.OPENSSL_VERSION}}.tar.gz
           echo "::set-output name=status::success"
 
       - name: Compile
         id: compile
         if: steps.download_ndk.outputs.status == 'success' && steps.download_openssl.outputs.status == 'success' && !cancelled()
         run: |
-          rm -rf build
           mkdir build
           bash ./openssl_build_${{env.ANDROID_ABI}}.sh
           echo "::set-output name=status::success"
 
       - name: Generate release tag
         id: tag
         run: |
-          tar -zcvf OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}.tar.gz openssl_${{env.VERSION}}_${{env.ANDROID_ABI}}
-          echo "::set-output name=release_tag::${{env.VERSION}}"
+          tar -zcvf OpenSSL_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}.tar.gz openssl_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}
+          echo "::set-output name=release_tag::${{env.OPENSSL_VERSION}}"
           echo "::set-output name=status::success"
       
       - name: Upload firmware to release
@@ -70,7 +69,3 @@ jobs:
         with:
           tag_name: ${{ steps.tag.outputs.release_tag }}
           files: ${{env.WORK_PATH}}/OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}.tar.gz
-
-      - name: WeChat notification
-        if: steps.tag.outputs.status == 'success' && !cancelled()
-        run: curl https://sc.ftqq.com/${{ secrets.SERVERCHAN }}.send?text=OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}编译完成
diff --git a/.github/workflows/build_mips.yml b/.github/workflows/build_mips.yml
@@ -10,8 +10,8 @@ on:
 
 env:
   ANDROID_ABI: mips
-  OPENSSL_VERSION: 3_0_0
-  VERSION: 3.0.0
+  OPENSSL_VERSION: 3.0.0
+  ANDROID_NDK_VERSION: r19c
   WORK_PATH: /home/runner/work/openssl_for_android/openssl_for_android
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
@@ -35,31 +35,30 @@ jobs:
       - name: Download Android NDK
         id: download_ndk
         run: |
-          aria2c https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip
-          unzip android-ndk-r14b-linux-x86_64.zip
+          aria2c https://dl.google.com/android/repository/android-ndk-${{env.ANDROID_NDK_VERSION}}-linux-x86_64.zip
+          unzip android-ndk-${{env.ANDROID_NDK_VERSION}}-linux-x86_64.zip
           echo "::set-output name=status::success"
 
       - name: Download OpenSSL
         id: download_openssl
         run: |
-          aria2c https://codeload.github.com/openssl/openssl/zip/OpenSSL_${{env.OPENSSL_VERSION}}
-          unzip openssl-OpenSSL_${{env.OPENSSL_VERSION}}.zip
+          aria2c https://www.openssl.org/source/openssl-${{env.OPENSSL_VERSION}}.tar.gz
+          tar -zxvf openssl-${{env.OPENSSL_VERSION}}.tar.gz
           echo "::set-output name=status::success"
 
       - name: Compile
         id: compile
         if: steps.download_ndk.outputs.status == 'success' && steps.download_openssl.outputs.status == 'success' && !cancelled()
         run: |
-          rm -rf build
           mkdir build
           bash ./openssl_build_${{env.ANDROID_ABI}}.sh
           echo "::set-output name=status::success"
 
       - name: Generate release tag
         id: tag
         run: |
-          tar -zcvf OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}.tar.gz openssl_${{env.VERSION}}_${{env.ANDROID_ABI}}
-          echo "::set-output name=release_tag::${{env.VERSION}}"
+          tar -zcvf OpenSSL_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}.tar.gz openssl_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}
+          echo "::set-output name=release_tag::${{env.OPENSSL_VERSION}}"
           echo "::set-output name=status::success"
       
       - name: Upload firmware to release
@@ -70,7 +69,3 @@ jobs:
         with:
           tag_name: ${{ steps.tag.outputs.release_tag }}
           files: ${{env.WORK_PATH}}/OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}.tar.gz
-
-      - name: WeChat notification
-        if: steps.tag.outputs.status == 'success' && !cancelled()
-        run: curl https://sc.ftqq.com/${{ secrets.SERVERCHAN }}.send?text=OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}编译完成
diff --git a/.github/workflows/build_mips64.yml b/.github/workflows/build_mips64.yml
@@ -10,8 +10,8 @@ on:
 
 env:
   ANDROID_ABI: mips64
-  OPENSSL_VERSION: 3_0_0
-  VERSION: 3.0.0
+  OPENSSL_VERSION: 3.0.0
+  ANDROID_NDK_VERSION: r19c
   WORK_PATH: /home/runner/work/openssl_for_android/openssl_for_android
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
@@ -35,31 +35,30 @@ jobs:
       - name: Download Android NDK
         id: download_ndk
         run: |
-          aria2c https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip
-          unzip android-ndk-r14b-linux-x86_64.zip
+          aria2c https://dl.google.com/android/repository/android-ndk-${{env.ANDROID_NDK_VERSION}}-linux-x86_64.zip
+          unzip android-ndk-${{env.ANDROID_NDK_VERSION}}-linux-x86_64.zip
           echo "::set-output name=status::success"
 
       - name: Download OpenSSL
         id: download_openssl
         run: |
-          aria2c https://codeload.github.com/openssl/openssl/zip/OpenSSL_${{env.OPENSSL_VERSION}}
-          unzip openssl-OpenSSL_${{env.OPENSSL_VERSION}}.zip
+          aria2c https://www.openssl.org/source/openssl-${{env.OPENSSL_VERSION}}.tar.gz
+          tar -zxvf openssl-${{env.OPENSSL_VERSION}}.tar.gz
           echo "::set-output name=status::success"
 
       - name: Compile
         id: compile
         if: steps.download_ndk.outputs.status == 'success' && steps.download_openssl.outputs.status == 'success' && !cancelled()
         run: |
-          rm -rf build
           mkdir build
           bash ./openssl_build_${{env.ANDROID_ABI}}.sh
           echo "::set-output name=status::success"
 
       - name: Generate release tag
         id: tag
         run: |
-          tar -zcvf OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}.tar.gz openssl_${{env.VERSION}}_${{env.ANDROID_ABI}}
-          echo "::set-output name=release_tag::${{env.VERSION}}"
+          tar -zcvf OpenSSL_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}.tar.gz openssl_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}
+          echo "::set-output name=release_tag::${{env.OPENSSL_VERSION}}"
           echo "::set-output name=status::success"
       
       - name: Upload firmware to release
@@ -70,7 +69,3 @@ jobs:
         with:
           tag_name: ${{ steps.tag.outputs.release_tag }}
           files: ${{env.WORK_PATH}}/OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}.tar.gz
-
-      - name: WeChat notification
-        if: steps.tag.outputs.status == 'success' && !cancelled()
-        run: curl https://sc.ftqq.com/${{ secrets.SERVERCHAN }}.send?text=OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}编译完成
diff --git a/.github/workflows/build_x86.yml b/.github/workflows/build_x86.yml
@@ -10,8 +10,8 @@ on:
 
 env:
   ANDROID_ABI: x86
-  OPENSSL_VERSION: 3_0_0
-  VERSION: 3.0.0
+  OPENSSL_VERSION: 3.0.0
+  ANDROID_NDK_VERSION: r19c
   WORK_PATH: /home/runner/work/openssl_for_android/openssl_for_android
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
@@ -35,31 +35,30 @@ jobs:
       - name: Download Android NDK
         id: download_ndk
         run: |
-          aria2c https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip
-          unzip android-ndk-r14b-linux-x86_64.zip
+          aria2c https://dl.google.com/android/repository/android-ndk-${{env.ANDROID_NDK_VERSION}}-linux-x86_64.zip
+          unzip android-ndk-${{env.ANDROID_NDK_VERSION}}-linux-x86_64.zip
           echo "::set-output name=status::success"
 
       - name: Download OpenSSL
         id: download_openssl
         run: |
-          aria2c https://codeload.github.com/openssl/openssl/zip/OpenSSL_${{env.OPENSSL_VERSION}}
-          unzip openssl-OpenSSL_${{env.OPENSSL_VERSION}}.zip
+          aria2c https://www.openssl.org/source/openssl-${{env.OPENSSL_VERSION}}.tar.gz
+          tar -zxvf openssl-${{env.OPENSSL_VERSION}}.tar.gz
           echo "::set-output name=status::success"
 
       - name: Compile
         id: compile
         if: steps.download_ndk.outputs.status == 'success' && steps.download_openssl.outputs.status == 'success' && !cancelled()
         run: |
-          rm -rf build
           mkdir build
           bash ./openssl_build_${{env.ANDROID_ABI}}.sh
           echo "::set-output name=status::success"
 
       - name: Generate release tag
         id: tag
         run: |
-          tar -zcvf OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}.tar.gz openssl_${{env.VERSION}}_${{env.ANDROID_ABI}}
-          echo "::set-output name=release_tag::${{env.VERSION}}"
+          tar -zcvf OpenSSL_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}.tar.gz openssl_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}
+          echo "::set-output name=release_tag::${{env.OPENSSL_VERSION}}"
           echo "::set-output name=status::success"
       
       - name: Upload firmware to release
@@ -70,7 +69,3 @@ jobs:
         with:
           tag_name: ${{ steps.tag.outputs.release_tag }}
           files: ${{env.WORK_PATH}}/OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}.tar.gz
-
-      - name: WeChat notification
-        if: steps.tag.outputs.status == 'success' && !cancelled()
-        run: curl https://sc.ftqq.com/${{ secrets.SERVERCHAN }}.send?text=OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}编译完成
diff --git a/.github/workflows/build_x86_64.yml b/.github/workflows/build_x86_64.yml
@@ -10,8 +10,8 @@ on:
 
 env:
   ANDROID_ABI: x86_64
-  OPENSSL_VERSION: 3_0_0
-  VERSION: 3.0.0
+  OPENSSL_VERSION: 3.0.0
+  ANDROID_NDK_VERSION: r19c
   WORK_PATH: /home/runner/work/openssl_for_android/openssl_for_android
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
@@ -35,31 +35,30 @@ jobs:
       - name: Download Android NDK
         id: download_ndk
         run: |
-          aria2c https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip
-          unzip android-ndk-r14b-linux-x86_64.zip
+          aria2c https://dl.google.com/android/repository/android-ndk-${{env.ANDROID_NDK_VERSION}}-linux-x86_64.zip
+          unzip android-ndk-${{env.ANDROID_NDK_VERSION}}-linux-x86_64.zip
           echo "::set-output name=status::success"
 
       - name: Download OpenSSL
         id: download_openssl
         run: |
-          aria2c https://codeload.github.com/openssl/openssl/zip/OpenSSL_${{env.OPENSSL_VERSION}}
-          unzip openssl-OpenSSL_${{env.OPENSSL_VERSION}}.zip
+          aria2c https://www.openssl.org/source/openssl-${{env.OPENSSL_VERSION}}.tar.gz
+          tar -zxvf openssl-${{env.OPENSSL_VERSION}}.tar.gz
           echo "::set-output name=status::success"
 
       - name: Compile
         id: compile
         if: steps.download_ndk.outputs.status == 'success' && steps.download_openssl.outputs.status == 'success' && !cancelled()
         run: |
-          rm -rf build
           mkdir build
           bash ./openssl_build_${{env.ANDROID_ABI}}.sh
           echo "::set-output name=status::success"
 
       - name: Generate release tag
         id: tag
         run: |
-          tar -zcvf OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}.tar.gz openssl_${{env.VERSION}}_${{env.ANDROID_ABI}}
-          echo "::set-output name=release_tag::${{env.VERSION}}"
+          tar -zcvf OpenSSL_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}.tar.gz openssl_${{env.OPENSSL_VERSION}}_${{env.ANDROID_ABI}}
+          echo "::set-output name=release_tag::${{env.OPENSSL_VERSION}}"
           echo "::set-output name=status::success"
       
       - name: Upload firmware to release
@@ -70,7 +69,3 @@ jobs:
         with:
           tag_name: ${{ steps.tag.outputs.release_tag }}
           files: ${{env.WORK_PATH}}/OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}.tar.gz
-
-      - name: WeChat notification
-        if: steps.tag.outputs.status == 'success' && !cancelled()
-        run: curl https://sc.ftqq.com/${{ secrets.SERVERCHAN }}.send?text=OpenSSL_${{env.VERSION}}_${{env.ANDROID_ABI}}编译完成
diff --git a/openssl_build.sh b/openssl_build.sh
@@ -74,7 +74,7 @@ then
 elif [ "$ANDROID_TARGET_ABI" == "x86_64" ]
 then
     export ANDROID_NDK_ROOT=${ANDROID_NDK_PATH}
-    PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$ANDROID_NDK_ROOT/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin:$ANDROID_NDK_ROOT/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin:$PATH
+    PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$ANDROID_NDK_ROOT/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin:$PATH
     cd ${OPENSSL_TMP_FOLDER}
     ./Configure android-x86_64 -D__ANDROID_API__=${ANDROID_TARGET_API} no-shared no-tests --prefix=${OUTPUT_PATH}
     build_library