Merge branch 'master' into dev

.github/workflows/build.yml

@@ -47,72 +47,6 @@ jobs:
           name: android-apk
           path: build/app/outputs/flutter-apk/app-release.apk
 
-  #  build-msix:
-  #    runs-on: windows-latest
-  #    name: Build MSIX
-  #    needs: build-apk
-  #
-  #    steps:
-  #      - name: Checkout Repository
-  #        uses: actions/checkout@v3
-  #
-  #      - name: Set Up Flutter
-  #        uses: subosito/flutter-action@v2
-  #        with:
-  #          flutter-version: '3.27.1'
-  #
-  #      - name: Install Dependencies
-  #        run: flutter pub get
-  #
-  #      - name: Build MSIX
-  #        run: flutter build windows --release
-  #
-  #      - name: Upload MSIX Artifact
-  #        uses: actions/upload-artifact@v3
-  #        with:
-  #          name: windows-msix
-  #          path: build/windows/runner/Release/*.msix
-
-  #  build-ios-macos:
-  #    runs-on: macos-latest
-  #    name: Build iOS & macOS
-  #    needs: build-apk
-  #
-  #    steps:
-  #      - name: Checkout Repository
-  #        uses: actions/checkout@v3
-  #
-  #      - name: Set Up Flutter
-  #        uses: subosito/flutter-action@v2
-  #        with:
-  #          flutter-version: '3.27.0-0.2.pre'
-  #
-  #      - name: Install Dependencies
-  #        run: flutter pub get
-  #
-  #      - name: Set Up Certificates and Profiles
-  #        run: |
-  #          echo "${{ secrets.CERTIFICATE }}" | base64 --decode > signing_certificate.p12
-  #          echo "${{ secrets.PROFILE }}" | base64 --decode > provisioning_profile.mobileprovision
-  #
-  #      - name: Build iOS
-  #        run: flutter build ipa --release
-  #
-  #      - name: Build macOS
-  #        run: flutter build macos --release
-  #
-  #      - name: Upload iOS Artifact
-  #        uses: actions/upload-artifact@v3
-  #        with:
-  #          name: ios-ipa
-  #          path: build/ios/ipa/*.ipa
-  #
-  #      - name: Upload macOS Artifact
-  #        uses: actions/upload-artifact@v3
-  #        with:
-  #          name: macos-app
-  #          path: build/macos/Build/Products/Release/*.app
-
   release:
     runs-on: ubuntu-latest
     name: Publish Release
@@ -129,24 +63,6 @@ jobs:
           name: android-apk
           path: artifacts/android
 
-      # - name: Download MSIX Artifact
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: windows-msix
-      #     path: artifacts/windows
-      #
-      # - name: Download iOS Artifact
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: ios-ipa
-      #     path: artifacts/ios
-      #
-      # - name: Download macOS Artifact
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: macos-app
-      #     path: artifacts/macos
-
       - name: Extract Version
         id: extract_version
         run: |
@@ -157,11 +73,7 @@ jobs:
       - name: Rename Artifacts
         run: |
           mkdir -p renamed-artifacts
-          # Android APK
-          mv artifacts/android/*.apk renamed-artifacts/moodiary-${{ env.VERSION }}-android-arm64.apk
-          # mv artifacts/windows/*.msix renamed-artifacts/moodiary-${{ env.VERSION }}-windows-x64.msix
-          # mv artifacts/ios/*.ipa renamed-artifacts/moodiary-${{ env.VERSION }}-ios.ipa
-          # mv artifacts/macos/*.app renamed-artifacts/moodiary-${{ env.VERSION }}-macos.app
+          mv artifacts/android/app-release.apk renamed-artifacts/moodiary-${{ env.VERSION }}-android-arm64.apk
 
       - name: Generate Release Notes
         id: release_notes

README.en.md

@@ -6,7 +6,7 @@
 
 <p align="center"><a href="README.md">简体中文</a> | English</p>
 
-<p align="center">QQ Group: 760014526</p>
+<p align="center"><a href="https://answer.moodiary.net" target="_blank">Community Forum</a>丨QQ Group: 760014526</p>
 
 <div align="center">
   <img src="https://img.shields.io/badge/Flutter-3.27.0-blue?style=for-the-badge">

README.md

@@ -6,7 +6,7 @@
 
 <p align="center">简体中文 | <a href="README.en.md">English</a></p>
 
-<p align="center">QQ 交流群：760014526</p>
+<p align="center"><a href="https://answer.moodiary.net" target="_blank">交流论坛</a>丨QQ群: 760014526</p>
 
 <div align="center">
   <img src="https://img.shields.io/badge/Flutter-3.27.0-blue?style=for-the-badge">