Merge branch 'main' into feat/android

Author: MistEO

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+indent_style = space
+insert_final_newline = true
+charset = utf-8
+end_of_line = lf
+indent_size = 4

.github/workflows/build.yml

@@ -28,33 +28,7 @@ on:
 
 jobs:
   meta:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - id: set_tag
-        run: |
-          is_release=${{ startsWith(github.ref, 'refs/tags/v') }}
-          tag=$(git describe --tags --match "v*" ${{ github.ref }} || true)
-          if [[ $tag != v* ]]; then
-            tag=$(curl -sX GET "https://api.github.com/repos/MaaXYZ/MaaFramework/releases/latest" --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' | awk '/tag_name/{print $4}' FS='["]')
-            if [[ $tag != v* ]]; then
-              tag="v0.0.0"
-            fi
-            tag=$(date "+$tag-%y%m%d-$(git rev-parse --short HEAD)")
-          fi
-          if ! $($is_release) ; then
-            prefix=${tag%-*-*}
-            suffix=${tag#$prefix-}
-            tag="$prefix-ci.$suffix"
-          fi
-
-          echo tag=$tag | tee -a $GITHUB_OUTPUT
-          echo is_release=$is_release | tee -a $GITHUB_OUTPUT
-    outputs:
-      tag: ${{ steps.set_tag.outputs.tag }}
-      is_release: ${{ steps.set_tag.outputs.is_release }}
+    uses: ./.github/workflows/meta.yml
 
   windows:
     needs: meta
@@ -173,8 +147,8 @@ jobs:
 
       - name: Build MAA
         env:
-          CC: ${{ matrix.arch == 'x86_64' && 'ccache gcc' || 'ccache aarch64-linux-gnu-gcc' }}
-          CXX: ${{ matrix.arch == 'x86_64' && 'ccache g++' || 'ccache aarch64-linux-gnu-g++' }}
+          CC: ${{ matrix.arch == 'x86_64' && 'gcc' || 'aarch64-linux-gnu-gcc' }}
+          CXX: ${{ matrix.arch == 'x86_64' && 'g++' || 'aarch64-linux-gnu-g++' }}
         run: |
           cmake --preset 'NinjaMulti' \
             -DMAADEPS_TRIPLET='maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux' \
@@ -220,41 +194,31 @@ jobs:
 
       - name: Install dep
         run: |
-          brew install cmake ninja
-        # ccache?
+          brew install cmake ninja ccache
 
       - name: Install compiler
         run: |
           brew install llvm
-        # 17
+
+      - name: Setup ccache
+        uses: Chocobo1/setup-ccache-action@v1
+        with:
+          remove_stale_cache: false
 
       - name: Bootstrap MaaDeps
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           python3 tools/maadeps-download.py ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-osx
 
-      - name: Build MAA for x86_64
-        if: ${{ matrix.arch == 'x86_64' }}
-        env:
-          CC: "/usr/local/opt/llvm/bin/clang"
-          CXX: "/usr/local/opt/llvm/bin/clang++"
-        run: |
-          cmake --preset 'NinjaMulti' \
-            -DMAADEPS_TRIPLET='maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-osx' \
-            -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}'
-
-          cmake --build build --preset 'NinjaMulti - Release' -j 16
-
-      - name: Build MAA for aarch64
-        if: ${{ matrix.arch == 'aarch64' }}
-        env:
-          CC: "/opt/homebrew/opt/llvm/bin/clang"
-          CXX: "/opt/homebrew/opt/llvm/bin/clang++"
+      - name: Build MAA
         run: |
+          LLVM_PREFIX=$(brew --prefix llvm)
           cmake --preset 'NinjaMulti' \
             -DMAADEPS_TRIPLET='maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-osx' \
-            -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}'
+            -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}' \
+            -DCMAKE_C_COMPILER=${LLVM_PREFIX}/bin/clang \
+            -DCMAKE_CXX_COMPILER=${LLVM_PREFIX}/bin/clang++
 
           cmake --build build --preset 'NinjaMulti - Release' -j 16
 
@@ -348,9 +312,6 @@ jobs:
   nuget_pack:
     needs: [meta, windows, ubuntu, macos, android]
     runs-on: ubuntu-latest
-    env:
-      NUGET_PACKAGE_ID: Maa.Framework.Runtimes # need ${{ secrets.NuGetAPIKey }}
-
     steps:
       - uses: nuget/setup-nuget@v1
 
@@ -362,10 +323,15 @@ jobs:
       - name: Nuget Pack
         working-directory: tools/nupkgs
         run: |
-          tag=${{ needs.meta.outputs.tag }}
-          nuget pack Maa.Framework.Runtimes.nuspec \
-            -Verbosity detailed \
-            -Properties "id=$NUGET_PACKAGE_ID;version=${tag#v};year=$(date +%Y);branch=$(git rev-parse --abbrev-ref HEAD);commit=$(git rev-parse HEAD);docs_path=../../docs;assets_path=../../assets"
+          wget https://raw.githubusercontent.com/MaaAssistantArknights/design/main/logo/maa-logo_128x128.png
+          version=${{ needs.meta.outputs.version }}
+          for NUSPEC in Maa.Framework.Runtime*.nuspec; do
+            cat Head.nuspec $NUSPEC Tail.nuspec > temp && mv temp $NUSPEC
+
+            nuget pack $NUSPEC \
+              -Verbosity detailed \
+              -Properties "version=${version//-post/};year=$(date +%Y);branch=$(git rev-parse --abbrev-ref HEAD);commit=$(git rev-parse HEAD);root_path=../.."
+          done
 
       - uses: actions/upload-artifact@v3
         if: always()
@@ -400,6 +366,7 @@ jobs:
     needs: [meta, windows, ubuntu, macos, nuget_pack, pip_pack]
     runs-on: ubuntu-latest
     env:
+      OUTPUT_PUBLISH_FAILED: 'echo "failed=true" >> $GITHUB_OUTPUT && echo "::error::Failed to publish packages"'
       NUGET_PACKAGE_SOURCE: https://api.nuget.org/v3/index.json # https://apiint.nugettest.org/v3/index.json
 
     steps:
@@ -408,20 +375,23 @@ jobs:
           path: assets
 
       - name: Publish Nupkgs
+        id: nuget
         run: |
           nuget push assets/MAA-nupkgs/*.nupkg \
             -ApiKey ${{ secrets.NuGetAPIKey }} \
             -Source $NUGET_PACKAGE_SOURCE \
-            -SkipDuplicate
+            || eval $OUTPUT_PUBLISH_FAILED
           rm -r assets/MAA-nupkgs
 
       - name: Publish Pip Packages
+        id: pip
         run: |
           pip install --upgrade twine
           python -m twine upload \
             assets/MAA-pip-pkgs/*.whl \
             --username __token__\
-            --password ${{ secrets.PYPI_TOKEN }}
+            --password ${{ secrets.PYPI_TOKEN }} \
+            || eval $OUTPUT_PUBLISH_FAILED
           rm -r assets/MAA-pip-pkgs
 
       - run: |
@@ -434,3 +404,14 @@ jobs:
         with:
           files: assets/*.zip
           tag_name: ${{ needs.meta.outputs.tag }}
+
+      - name: Create issue if failed to publish packages
+        if: steps.nuget.outputs.failed || steps.pip.outputs.failed
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'create-issue'
+          title: '${{ needs.meta.outputs.tag }} failed to publish packages'
+          body: |
+            Please manually publish the following packages:
+            ${{ steps.nuget.outputs.failed && '- nuget @moomiji' || '' }}
+            ${{ steps.pip.outputs.failed && '- pip @QiE2035' || '' }}

.github/workflows/doc.yml

@@ -8,11 +8,14 @@ on:
   workflow_dispatch:
 
 jobs:
+  meta:
+    uses: ./.github/workflows/meta.yml
 
   build:
+    needs: meta
     runs-on: ubuntu-latest
     env:
-      VERSION: ${{ github.ref_name }}
+      DOC_VERSION: ${{ format('({0}) {1}', needs.meta.outputs.tag == github.ref_name && 'main' || github.ref_name, needs.meta.outputs.tag) }}
     permissions:
       contents: write
     steps:
@@ -25,9 +28,17 @@ jobs:
         with:
           doxyfile-path: tools/Doxygen/Doxyfile
 
+      - name: Build index.json
+        uses: MaaXYZ/MaaApiConverter@v1
+        with:
+          version: ${{ env.DOC_VERSION }}
+          xml: ./docs-gen/html/xml
+          output: ./docs-gen/html
+
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./docs-gen/html
           publish_branch: gh-pages
+          commit_message: ${{ env.DOC_VERSION }}

.github/workflows/meta.yml

@@ -0,0 +1,59 @@
+name: meta
+
+on:
+  workflow_call:
+    outputs:
+      is_release:
+        value: ${{ jobs.set.outputs.is_release }}
+      tag:
+        value: ${{ jobs.set.outputs.tag }}
+      version:
+        value: ${{ jobs.set.outputs.version }}
+
+jobs:
+  set:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - id: set
+        run: |
+          is_release=${{ startsWith(github.ref, 'refs/tags/v') }}
+          commit_hash=$(git rev-parse --short HEAD)
+
+          if $is_release; then
+            tag=$(git describe --tags || true)
+          else
+            tag=$(git describe --tags --match "v*" --exclude "*-post*" || true)
+          fi
+          if [[ $tag != v* ]]; then
+            if $is_release; then echo "::error::Failed to get tag on releasing" && exit 1; fi
+            ver_core=$(curl -sX GET "https://api.github.com/repos/MaaXYZ/MaaFramework/releases/latest" --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' | awk '/tag_name/{print $4}' FS='["]' || true)
+            tag=$(date "+$ver_core-1%m%d-${commit_hash}")
+            if [[ $tag != v* ]]; then
+              tag=$(date "+v%Y.%-m.%-d-2%H%M-${commit_hash}")
+            fi
+          fi
+
+          if $is_release; then
+            version=${tag#v}
+          else
+            ver_core=${tag%-*-*}
+            suffixs=(${tag//-/ })
+            tag=${ver_core}-post.${suffixs[-2]}-ci.${{ github.run_id }}
+            version=${tag#v}+${commit_hash}.$(date +%Y%m%d)
+          fi
+
+          echo "tag=$tag
+          version=$version
+          is_release=$is_release" | tee -a "$GITHUB_OUTPUT"
+    outputs:
+      is_release: ${{ steps.set.outputs.is_release }}
+      tag: ${{ steps.set.outputs.tag }}         # v<release version> | v<ci version>
+      version: ${{ steps.set.outputs.version }} # <release version> | <ci version>+<build> e.g ↓
+    # 主版本号.次版本号.修订号[-(alpha|beta|rc).预发布号]
+    #   [-post.发布后号[-ci.${{ github.run_id }}]+${commit_hash}.${dateY%m%d}]
+    #     1.7.0
+    #     1.7.0-beta.1
+    #     1.7.0-post.6-ci.8678478007+gf5e12a1c.20240413

.github/workflows/test.yml

@@ -28,33 +28,7 @@ on:
 
 jobs:
   meta:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - id: set_tag
-        run: |
-          is_release=${{ startsWith(github.ref, 'refs/tags/v') }}
-          tag=$(git describe --tags --match "v*" ${{ github.ref }} || true)
-          if [[ $tag != v* ]]; then
-            tag=$(curl -sX GET "https://api.github.com/repos/MaaXYZ/MaaFramework/releases/latest" --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' | awk '/tag_name/{print $4}' FS='["]')
-            if [[ $tag != v* ]]; then
-              tag="v0.0.0"
-            fi
-            tag=$(date "+$tag-%y%m%d-$(git rev-parse --short HEAD)")
-          fi
-          if ! $($is_release) ; then
-            prefix=${tag%-*-*}
-            suffix=${tag#$prefix-}
-            tag="$prefix-ci.$suffix"
-          fi
-
-          echo tag=$tag | tee -a $GITHUB_OUTPUT
-          echo is_release=$is_release | tee -a $GITHUB_OUTPUT
-    outputs:
-      tag: ${{ steps.set_tag.outputs.tag }}
-      is_release: ${{ steps.set_tag.outputs.is_release }}
+    uses: ./.github/workflows/meta.yml
 
   windows:
     needs: meta
@@ -185,13 +159,13 @@ jobs:
 
       - name: Build MAA
         env:
-          CC: ${{ matrix.arch == 'x86_64' && 'ccache gcc' || 'ccache aarch64-linux-gnu-gcc' }}
-          CXX: ${{ matrix.arch == 'x86_64' && 'ccache g++' || 'ccache aarch64-linux-gnu-g++' }}
+          CC: ${{ matrix.arch == 'x86_64' && 'gcc' || 'aarch64-linux-gnu-gcc' }}
+          CXX: ${{ matrix.arch == 'x86_64' && 'g++' || 'aarch64-linux-gnu-g++' }}
         run: |
           cmake --preset 'NinjaMulti' \
             -DMAADEPS_TRIPLET='maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux' \
             -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}' \
-            -DBUILD_HTTP_CLI=OFF -DBUILD_PIPELINE_TESTING=ON -DBUILD_DLOPEN_TESTING=ON
+            -DBUILD_PIPELINE_TESTING=ON -DBUILD_DLOPEN_TESTING=ON
 
           cmake --build build --preset 'NinjaMulti - Release' -j 16
 
@@ -253,43 +227,32 @@ jobs:
 
       - name: Install dep
         run: |
-          brew install cmake ninja
-        # ccache?
+          brew install cmake ninja ccache
 
       - name: Install compiler
         run: |
           brew install llvm
-        # 17
+
+      - name: Setup ccache
+        uses: Chocobo1/setup-ccache-action@v1
+        with:
+          remove_stale_cache: false
 
       - name: Bootstrap MaaDeps
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           python3 tools/maadeps-download.py ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-osx
 
-      - name: Build MAA for x86_64
-        if: ${{ matrix.arch == 'x86_64' }}
-        env:
-          CC: "/usr/local/opt/llvm/bin/clang"
-          CXX: "/usr/local/opt/llvm/bin/clang++"
-        run: |
-          cmake --preset 'NinjaMulti' \
-            -DMAADEPS_TRIPLET='maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-osx' \
-            -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}' \
-            -DBUILD_HTTP_CLI=OFF -DBUILD_PIPELINE_TESTING=ON -DBUILD_DLOPEN_TESTING=ON
-
-          cmake --build build --preset 'NinjaMulti - Release' -j 16
-
-      - name: Build MAA for aarch64
-        if: ${{ matrix.arch == 'aarch64' }}
-        env:
-          CC: "/opt/homebrew/opt/llvm/bin/clang"
-          CXX: "/opt/homebrew/opt/llvm/bin/clang++"
+      - name: Build MAA
         run: |
+          LLVM_PREFIX=$(brew --prefix llvm)
           cmake --preset 'NinjaMulti' \
             -DMAADEPS_TRIPLET='maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-osx' \
             -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}' \
-            -DBUILD_HTTP_CLI=OFF -DBUILD_PIPELINE_TESTING=ON -DBUILD_DLOPEN_TESTING=ON
+            -DBUILD_PIPELINE_TESTING=ON -DBUILD_DLOPEN_TESTING=ON \
+            -DCMAKE_C_COMPILER=${LLVM_PREFIX}/bin/clang \
+            -DCMAKE_CXX_COMPILER=${LLVM_PREFIX}/bin/clang++
 
           cmake --build build --preset 'NinjaMulti - Release' -j 16
 

.gitignore

@@ -442,3 +442,8 @@ FodyWeavers.xsd
 # Chore
 .DS_Store
 .nuke/temp/*
+
+!include/MaaToolkit/Win32
+
+export_targets.cmake
+maa_pi_config.json