From ce23a819692571b46bcd8e0fb22cbcac855a475a Mon Sep 17 00:00:00 2001 From: Edgard Lorraine Messias Date: Mon, 24 Jun 2024 14:10:06 -0300 Subject: [PATCH] chore: Updated build_push.yml --- .github/scripts/bump-versions.py | 4 ++-- .github/scripts/commit-repo.sh | 4 ++-- .github/workflows/build_push.yml | 21 ++------------------- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/.github/scripts/bump-versions.py b/.github/scripts/bump-versions.py index ec2d56a8..51c15729 100644 --- a/.github/scripts/bump-versions.py +++ b/.github/scripts/bump-versions.py @@ -11,8 +11,8 @@ VERSION_STR = "VersionCode =" VERSION_REGEX = re.compile(f"{VERSION_STR} (\\d+)") BUMPED_FILES: list[Path] = [] -BOT_EMAIL = "aniyomi-bot@aniyomi.org" -BOT_NAME = "aniyomi-bot[bot]" +BOT_EMAIL = "134626626+almightyhak@users.noreply.github.com" +BOT_NAME = "almightyhak" def has_match(query: str, file: Path) -> tuple[Path, bool]: return (file, query in file.read_text()) diff --git a/.github/scripts/commit-repo.sh b/.github/scripts/commit-repo.sh index e053a440..980a4b51 100644 --- a/.github/scripts/commit-repo.sh +++ b/.github/scripts/commit-repo.sh @@ -2,8 +2,8 @@ set -e rsync -a --delete --exclude .git --exclude .gitignore ../main/repo/ . -git config --global user.email "aniyomi-bot@aniyomi.org" -git config --global user.name "aniyomi-bot[bot]" +git config --global user.email "134626626+almightyhak@users.noreply.github.com" +git config --global user.name "almightyhak" git status if [ -n "$(git status --porcelain)" ]; then git add . diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index c9523407..9f5ca108 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: ref: main - token: ${{ secrets.ANIYOMIORG_BOT_PAT }} + token: ${{ secrets.BOT_PAT }} - name: Find lib changes id: modified-libs @@ -40,14 +40,6 @@ jobs: files_separator: " " safe_output: false - - name: Import GPG key - uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.GPG_PASSPHRASE }} - git_user_signingkey: true - git_commit_gpgsign: true - # This step is going to commit, but this will not trigger another workflow. - name: Bump extensions that uses a modified lib if: steps.modified-libs.outputs.any_changed == 'true' @@ -159,19 +151,10 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: repository: almightyhak/aniyomi-anime-repo - token: ${{ secrets.ANIYOMIORG_BOT_PAT }} + token: ${{ secrets.BOT_PAT }} ref: main path: repo - - name: Import GPG key - uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.GPG_PASSPHRASE }} - git_user_signingkey: true - git_commit_gpgsign: true - workdir: repo - - name: Deploy repo run: | cd repo