From 0b6120defc7ec96f92cd573b67197cefbe7c9444 Mon Sep 17 00:00:00 2001 From: Marc Froehlich Date: Mon, 20 Jul 2026 23:56:07 +0200 Subject: [PATCH] another AUR build fix --- .github/workflows/aur-nightly-git.yml | 30 +++++-------------- .../view/Kst4ContestApplication.java | 6 ++-- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/.github/workflows/aur-nightly-git.yml b/.github/workflows/aur-nightly-git.yml index a915b74..28f365c 100644 --- a/.github/workflows/aur-nightly-git.yml +++ b/.github/workflows/aur-nightly-git.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: permissions: - contents: write + contents: read jobs: update-aur-git: @@ -65,29 +65,9 @@ jobs: cp /tmp/kst4contest-git/.SRCINFO \ packaging/aur/kst4contest-git/.SRCINFO + echo "Generated .SRCINFO:" cat packaging/aur/kst4contest-git/.SRCINFO - - name: Commit updated PKGBUILD to repository - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - git config user.email \ - "41898282+github-actions[bot]@users.noreply.github.com" - git config user.name "github-actions[bot]" - - git remote set-url origin \ - "https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git" - - git add packaging/aur/kst4contest-git/ - - if git diff --cached --quiet; then - echo "No repository changes to commit." - else - git commit \ - -m "chore: update kst4contest-git to ${{ steps.ver.outputs.pkgver }} [skip ci]" - git push - fi - - name: Set up AUR SSH env: AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }} @@ -108,6 +88,9 @@ jobs: User aur EOF + chmod 600 ~/.ssh/config + chmod 600 ~/.ssh/known_hosts + - name: Push package metadata to AUR run: | git config --global user.email "philipp@wagnersnetz.de" @@ -120,6 +103,7 @@ jobs: git clone \ "ssh://aur@aur.archlinux.org/kst4contest-git.git" \ "${AUR_DIR}" || { + echo "AUR repository could not be cloned; initializing it locally." mkdir -p "${AUR_DIR}" git -C "${AUR_DIR}" init git -C "${AUR_DIR}" remote add origin \ @@ -135,7 +119,7 @@ jobs: git -C "${AUR_DIR}" add PKGBUILD .SRCINFO if git -C "${AUR_DIR}" diff --cached --quiet; then - echo "kst4contest-git: no changes, skipping AUR push." + echo "kst4contest-git: package metadata is already current." else git -C "${AUR_DIR}" commit \ -m "Update pkgver to ${{ steps.ver.outputs.pkgver }}" diff --git a/src/main/java/kst4contest/view/Kst4ContestApplication.java b/src/main/java/kst4contest/view/Kst4ContestApplication.java index 95ca007..1ec2dea 100644 --- a/src/main/java/kst4contest/view/Kst4ContestApplication.java +++ b/src/main/java/kst4contest/view/Kst4ContestApplication.java @@ -8178,14 +8178,14 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL > ApplicationConstants.APPLICATION_CURRENTVERSIONNUMBER; } -// if (updateAvailable) { + if (updateAvailable) { stage_updateStage.show(); -// } else { + } else { // stage_updateStage.show(); only for debugging check //nothing to do -// } + } } catch (Exception excOnUpdateFileProcessing) { System.out.println("[KST4ContestApp, ERROR]: Problem on Updateservice! " + excOnUpdateFileProcessing.getMessage()); excOnUpdateFileProcessing.printStackTrace();