fix: auto-fix linting issues

This commit is contained in:
alexbelgium
2025-08-31 00:32:39 +00:00
committed by github-actions[bot]
parent 1359c5509e
commit 89fdab7e7a
6 changed files with 21 additions and 21 deletions

View File

@@ -6,18 +6,18 @@ TARGET_BRANCH="main"
# Make sure we are in a git repo
if ! git rev-parse --git-dir > /dev/null 2>&1; then
echo "❌ Not a git repository"
exit 1
echo "❌ Not a git repository"
exit 1
fi
# Get list of open, non-draft PR numbers via GitHub API
echo "🔍 Fetching open PRs..."
mapfile -t PRS < <(curl -s "https://api.github.com/repos/alexbelgium/BirdNET-Pi/pulls?state=open&per_page=100" \
| jq -r '.[] | select(.draft==false) | .number')
| jq -r '.[] | select(.draft==false) | .number')
if [[ ${#PRS[@]} -eq 0 ]]; then
echo "✅ No open non-draft PRs found."
exit 0
echo "✅ No open non-draft PRs found."
exit 0
fi
echo "Found PRs: ${PRS[*]}"
@@ -29,18 +29,18 @@ git pull origin "$TARGET_BRANCH"
# Merge each PR
for pr in "${PRS[@]}"; do
echo "=== Merging PR #$pr ==="
echo "=== Merging PR #$pr ==="
# Fetch PR branch from GitHub refs
git fetch origin pull/"$pr"/head:pr-"$pr"
# Fetch PR branch from GitHub refs
git fetch origin pull/"$pr"/head:pr-"$pr"
# Merge into target branch, no fast-forward (like GitHub)
if ! git merge --no-ff --no-edit "pr-$pr"; then
echo "⚠️ Merge conflict in PR #$pr."
echo " Resolve manually, then run: git merge --continue"
echo " After resolving, re-run this script to finish remaining PRs."
exit 1
fi
# Merge into target branch, no fast-forward (like GitHub)
if ! git merge --no-ff --no-edit "pr-$pr"; then
echo "⚠️ Merge conflict in PR #$pr."
echo " Resolve manually, then run: git merge --continue"
echo " After resolving, re-run this script to finish remaining PRs."
exit 1
fi
done
echo "✅ All open non-draft PRs merged into $TARGET_BRANCH"

0
calibre_web/rootfs/etc/services.d/nginx/run Normal file → Executable file
View File

View File

@@ -18,12 +18,12 @@
"name": "Collabora",
"options": {
"aliasgroup1": "",
"certfile": "fullchain.pem",
"domain": "",
"extra_params": "--o:ssl.enable=false --o:user_interface.use_integration_theme=false --o:net.proto=IPv4",
"certfile": "fullchain.pem",
"keyfile": "privkey.pem",
"ssl": false,
"password": "",
"ssl": false,
"username": ""
},
"ports": {
@@ -35,15 +35,15 @@
"schema": {
"TZ": "str?",
"aliasgroup1": "str",
"certfile": "str",
"keyfile": "str",
"ssl": "bool",
"cert_domain": "bool?",
"server_name": "str?",
"certfile": "str",
"dictionaries": "str?",
"domain1": "str?",
"extra_params": "str?",
"keyfile": "str",
"password": "password",
"server_name": "str?",
"ssl": "bool",
"username": "str"
},
"slug": "collabora",

0
emby_beta/rootfs/etc/services.d/nginx/run Normal file → Executable file
View File

0
portainer/rootfs/etc/services.d/nginx/run Normal file → Executable file
View File

0
portainer/rootfs/etc/services.d/portainer/run Normal file → Executable file
View File