From bcdee2c2a27d602f9067f0cfbb01116c434ac37d Mon Sep 17 00:00:00 2001 From: Luis-Hebendanz Date: Thu, 14 Sep 2023 14:46:52 +0200 Subject: [PATCH 1/2] Changed to on_push and force --- .gitea/workflows/ui_assets.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/ui_assets.yaml b/.gitea/workflows/ui_assets.yaml index 9e245a4..fafed7b 100644 --- a/.gitea/workflows/ui_assets.yaml +++ b/.gitea/workflows/ui_assets.yaml @@ -3,7 +3,6 @@ on: push: branches: - main - - Qubasa-main jobs: test: runs-on: nix @@ -34,7 +33,7 @@ jobs: git config --global user.name "ui_assets[bot]" git commit -am "update ui-assets.nix" echo "Current branch: $GITHUB_REF_NAME" - git push origin HEAD:$GITHUB_REF_NAME + git push origin HEAD:$GITHUB_REF_NAME --force fi else echo "No UI files changed. Skipping asset build and push" From ddc5528e051d6a1b667509eb6e1e8f55b958bf59 Mon Sep 17 00:00:00 2001 From: Luis-Hebendanz Date: Thu, 14 Sep 2023 14:57:41 +0200 Subject: [PATCH 2/2] Fixed push perms error --- .gitea/workflows/ui_assets.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/ui_assets.yaml b/.gitea/workflows/ui_assets.yaml index fafed7b..a9f0889 100644 --- a/.gitea/workflows/ui_assets.yaml +++ b/.gitea/workflows/ui_assets.yaml @@ -29,11 +29,11 @@ jobs: # git push if we have a diff if [[ -n $(git diff) ]]; then - git config --global user.email "ui_assets[bot]@mail.clan.lol" - git config --global user.name "ui_assets[bot]" + git config --global user.email "clan-bot@clan.lol" + git config --global user.name "clan-bot" git commit -am "update ui-assets.nix" echo "Current branch: $GITHUB_REF_NAME" - git push origin HEAD:$GITHUB_REF_NAME --force + git push origin HEAD:$GITHUB_REF_NAME fi else echo "No UI files changed. Skipping asset build and push"