mirror of
https://github.com/praktimarc/kst4contest.git
synced 2026-08-04 01:15:27 +02:00
another AUR build fix
This commit is contained in:
@@ -7,7 +7,7 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update-aur-git:
|
update-aur-git:
|
||||||
@@ -65,29 +65,9 @@ jobs:
|
|||||||
cp /tmp/kst4contest-git/.SRCINFO \
|
cp /tmp/kst4contest-git/.SRCINFO \
|
||||||
packaging/aur/kst4contest-git/.SRCINFO
|
packaging/aur/kst4contest-git/.SRCINFO
|
||||||
|
|
||||||
|
echo "Generated .SRCINFO:"
|
||||||
cat packaging/aur/kst4contest-git/.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
|
- name: Set up AUR SSH
|
||||||
env:
|
env:
|
||||||
AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
|
AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
|
||||||
@@ -108,6 +88,9 @@ jobs:
|
|||||||
User aur
|
User aur
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
chmod 600 ~/.ssh/config
|
||||||
|
chmod 600 ~/.ssh/known_hosts
|
||||||
|
|
||||||
- name: Push package metadata to AUR
|
- name: Push package metadata to AUR
|
||||||
run: |
|
run: |
|
||||||
git config --global user.email "philipp@wagnersnetz.de"
|
git config --global user.email "philipp@wagnersnetz.de"
|
||||||
@@ -120,6 +103,7 @@ jobs:
|
|||||||
git clone \
|
git clone \
|
||||||
"ssh://aur@aur.archlinux.org/kst4contest-git.git" \
|
"ssh://aur@aur.archlinux.org/kst4contest-git.git" \
|
||||||
"${AUR_DIR}" || {
|
"${AUR_DIR}" || {
|
||||||
|
echo "AUR repository could not be cloned; initializing it locally."
|
||||||
mkdir -p "${AUR_DIR}"
|
mkdir -p "${AUR_DIR}"
|
||||||
git -C "${AUR_DIR}" init
|
git -C "${AUR_DIR}" init
|
||||||
git -C "${AUR_DIR}" remote add origin \
|
git -C "${AUR_DIR}" remote add origin \
|
||||||
@@ -135,7 +119,7 @@ jobs:
|
|||||||
git -C "${AUR_DIR}" add PKGBUILD .SRCINFO
|
git -C "${AUR_DIR}" add PKGBUILD .SRCINFO
|
||||||
|
|
||||||
if git -C "${AUR_DIR}" diff --cached --quiet; then
|
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
|
else
|
||||||
git -C "${AUR_DIR}" commit \
|
git -C "${AUR_DIR}" commit \
|
||||||
-m "Update pkgver to ${{ steps.ver.outputs.pkgver }}"
|
-m "Update pkgver to ${{ steps.ver.outputs.pkgver }}"
|
||||||
|
|||||||
@@ -8178,14 +8178,14 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
> ApplicationConstants.APPLICATION_CURRENTVERSIONNUMBER;
|
> ApplicationConstants.APPLICATION_CURRENTVERSIONNUMBER;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (updateAvailable) {
|
if (updateAvailable) {
|
||||||
stage_updateStage.show();
|
stage_updateStage.show();
|
||||||
// } else {
|
} else {
|
||||||
|
|
||||||
// stage_updateStage.show(); only for debugging check
|
// stage_updateStage.show(); only for debugging check
|
||||||
|
|
||||||
//nothing to do
|
//nothing to do
|
||||||
// }
|
}
|
||||||
} catch (Exception excOnUpdateFileProcessing) {
|
} catch (Exception excOnUpdateFileProcessing) {
|
||||||
System.out.println("[KST4ContestApp, ERROR]: Problem on Updateservice! " + excOnUpdateFileProcessing.getMessage());
|
System.out.println("[KST4ContestApp, ERROR]: Problem on Updateservice! " + excOnUpdateFileProcessing.getMessage());
|
||||||
excOnUpdateFileProcessing.printStackTrace();
|
excOnUpdateFileProcessing.printStackTrace();
|
||||||
|
|||||||
Reference in New Issue
Block a user