From 3cfc6d6a3130c0ca242afda4a35950120969ea45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YC=E9=85=B1luyancib?= Date: Sat, 15 Nov 2025 10:58:10 +0800 Subject: [PATCH] Manager/CI: Add spoofed manager build (#570) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * manager: add script for randomizing pkg name Signed-off-by: rsuntk Co-Authored-By: YC酱luyancib * manager: Update randomizer to avoid bug Revert "manager: Update randomizer to avoid bug" This reverts commit af9205e70a11db3e3d43bb34de880bbd6b4185b5. manager: Update randomizer to avoid bug * mamager: Update randomizer to fix error fixed > Task :app:compileReleaseAidl FAILED ERROR: /home/runner/work/SukiSU-Ultra/SukiSU-Ultra/manager/app/src/main/aidl/org/knifhr/zako/IKsuInterface.aidl:7.1-10: IKsuInterface should be declared in a file called com/sukisu/zako/IKsuInterface.aidl * manager:clean randomizer * ci:add spoofed manager build with matrix * 更新 build-manager.yml * 更新 build-manager.yml * fix * Revert "更新 build-manager.yml" This reverts commit da80e3f13a4c0324e783f2e4fc31539996521208. * ksubot: make MESSAGE_THREAD_ID optional --------- Signed-off-by: rsuntk Co-authored-by: rifsxd Co-authored-by: 5ec1cff --- .github/workflows/build-manager.yml | 30 ++++++++++++++++++++++++---- manager/randomizer | 31 +++++++++++++++++++++++++++++ scripts/ksubot.py | 19 +++++++++++------- 3 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 manager/randomizer diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml index 4babfe2f..5821e85b 100644 --- a/.github/workflows/build-manager.yml +++ b/.github/workflows/build-manager.yml @@ -55,6 +55,9 @@ jobs: build-manager: needs: build-ksud runs-on: ubuntu-latest + strategy: + matrix: + spoofed: ["true","false"] defaults: run: working-directory: ./manager @@ -74,6 +77,25 @@ jobs: echo "UPLOAD=false" >> $GITHUB_OUTPUT fi + + - name: Determine manager variant for telegram bot + id: determine + run: | + if [ "${{ matrix.spoofed }}" == "true" ]; then + echo "title=Spoofed-Manager" >> $GITHUB_OUTPUT + # maybe need a new var + echo "topicid=519956" >> $GITHUB_OUTPUT + else + echo "title=Manager" >> $GITHUB_OUTPUT + echo "topicid=${{ vars.MESSAGE_THREAD_ID }}" >> $GITHUB_OUTPUT + fi + + - name: Run randomizer + if: ${{ matrix.spoofed == 'true' }} + run: | + chmod +x randomizer + ./randomizer + - name: Write key if: ${{ ( github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' )) || github.ref_type == 'tag' }} run: | @@ -148,14 +170,14 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ ( github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' )) || github.ref_type == 'tag' }} with: - name: manager + name: ${{ steps.determine.outputs.title }} path: manager/app/build/outputs/apk/release/*.apk - name: Upload mappings uses: actions/upload-artifact@v4 if: ${{ ( github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' )) || github.ref_type == 'tag' }} with: - name: "mappings" + name: "${{ steps.determine.outputs.title }}-mappings" path: "manager/app/build/outputs/mapping/release/" - name: Bot session cache @@ -171,11 +193,11 @@ jobs: env: CHAT_ID: ${{ vars.CHAT_ID }} BOT_TOKEN: ${{ secrets.BOT_TOKEN }} - MESSAGE_THREAD_ID: ${{ vars.MESSAGE_THREAD_ID }} + MESSAGE_THREAD_ID: ${{ steps.determine.outputs.topicid }} COMMIT_MESSAGE: ${{ github.event.head_commit.message }} COMMIT_URL: ${{ github.event.head_commit.url }} RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} - TITLE: Manager + TITLE: ${{ steps.determine.outputs.title }} BRANCH: ${{ github.ref_name }} run: | if [ ! -z "${{ secrets.BOT_TOKEN }}" ]; then diff --git a/manager/randomizer b/manager/randomizer new file mode 100644 index 00000000..2cd4e4bf --- /dev/null +++ b/manager/randomizer @@ -0,0 +1,31 @@ +#! /usr/bin/env bash + +# Generate 3 random lowercase words (6 letters each) +word1=$(tr -dc 'a-z'