mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-06-02 22:04:06 +02:00
fix: auto-fix linting issues
This commit is contained in:
committed by
github-actions[bot]
parent
1359c5509e
commit
89fdab7e7a
@@ -6,18 +6,18 @@ TARGET_BRANCH="main"
|
|||||||
|
|
||||||
# Make sure we are in a git repo
|
# Make sure we are in a git repo
|
||||||
if ! git rev-parse --git-dir > /dev/null 2>&1; then
|
if ! git rev-parse --git-dir > /dev/null 2>&1; then
|
||||||
echo "❌ Not a git repository"
|
echo "❌ Not a git repository"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Get list of open, non-draft PR numbers via GitHub API
|
# Get list of open, non-draft PR numbers via GitHub API
|
||||||
echo "🔍 Fetching open PRs..."
|
echo "🔍 Fetching open PRs..."
|
||||||
mapfile -t PRS < <(curl -s "https://api.github.com/repos/alexbelgium/BirdNET-Pi/pulls?state=open&per_page=100" \
|
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
|
if [[ ${#PRS[@]} -eq 0 ]]; then
|
||||||
echo "✅ No open non-draft PRs found."
|
echo "✅ No open non-draft PRs found."
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Found PRs: ${PRS[*]}"
|
echo "Found PRs: ${PRS[*]}"
|
||||||
@@ -29,18 +29,18 @@ git pull origin "$TARGET_BRANCH"
|
|||||||
|
|
||||||
# Merge each PR
|
# Merge each PR
|
||||||
for pr in "${PRS[@]}"; do
|
for pr in "${PRS[@]}"; do
|
||||||
echo "=== Merging PR #$pr ==="
|
echo "=== Merging PR #$pr ==="
|
||||||
|
|
||||||
# Fetch PR branch from GitHub refs
|
# Fetch PR branch from GitHub refs
|
||||||
git fetch origin pull/"$pr"/head:pr-"$pr"
|
git fetch origin pull/"$pr"/head:pr-"$pr"
|
||||||
|
|
||||||
# Merge into target branch, no fast-forward (like GitHub)
|
# Merge into target branch, no fast-forward (like GitHub)
|
||||||
if ! git merge --no-ff --no-edit "pr-$pr"; then
|
if ! git merge --no-ff --no-edit "pr-$pr"; then
|
||||||
echo "⚠️ Merge conflict in PR #$pr."
|
echo "⚠️ Merge conflict in PR #$pr."
|
||||||
echo " Resolve manually, then run: git merge --continue"
|
echo " Resolve manually, then run: git merge --continue"
|
||||||
echo " After resolving, re-run this script to finish remaining PRs."
|
echo " After resolving, re-run this script to finish remaining PRs."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "✅ All open non-draft PRs merged into $TARGET_BRANCH"
|
echo "✅ All open non-draft PRs merged into $TARGET_BRANCH"
|
||||||
|
|||||||
0
calibre_web/rootfs/etc/services.d/nginx/run
Normal file → Executable file
0
calibre_web/rootfs/etc/services.d/nginx/run
Normal file → Executable file
@@ -18,12 +18,12 @@
|
|||||||
"name": "Collabora",
|
"name": "Collabora",
|
||||||
"options": {
|
"options": {
|
||||||
"aliasgroup1": "",
|
"aliasgroup1": "",
|
||||||
|
"certfile": "fullchain.pem",
|
||||||
"domain": "",
|
"domain": "",
|
||||||
"extra_params": "--o:ssl.enable=false --o:user_interface.use_integration_theme=false --o:net.proto=IPv4",
|
"extra_params": "--o:ssl.enable=false --o:user_interface.use_integration_theme=false --o:net.proto=IPv4",
|
||||||
"certfile": "fullchain.pem",
|
|
||||||
"keyfile": "privkey.pem",
|
"keyfile": "privkey.pem",
|
||||||
"ssl": false,
|
|
||||||
"password": "",
|
"password": "",
|
||||||
|
"ssl": false,
|
||||||
"username": ""
|
"username": ""
|
||||||
},
|
},
|
||||||
"ports": {
|
"ports": {
|
||||||
@@ -35,15 +35,15 @@
|
|||||||
"schema": {
|
"schema": {
|
||||||
"TZ": "str?",
|
"TZ": "str?",
|
||||||
"aliasgroup1": "str",
|
"aliasgroup1": "str",
|
||||||
"certfile": "str",
|
|
||||||
"keyfile": "str",
|
|
||||||
"ssl": "bool",
|
|
||||||
"cert_domain": "bool?",
|
"cert_domain": "bool?",
|
||||||
"server_name": "str?",
|
"certfile": "str",
|
||||||
"dictionaries": "str?",
|
"dictionaries": "str?",
|
||||||
"domain1": "str?",
|
"domain1": "str?",
|
||||||
"extra_params": "str?",
|
"extra_params": "str?",
|
||||||
|
"keyfile": "str",
|
||||||
"password": "password",
|
"password": "password",
|
||||||
|
"server_name": "str?",
|
||||||
|
"ssl": "bool",
|
||||||
"username": "str"
|
"username": "str"
|
||||||
},
|
},
|
||||||
"slug": "collabora",
|
"slug": "collabora",
|
||||||
|
|||||||
0
emby_beta/rootfs/etc/services.d/nginx/run
Normal file → Executable file
0
emby_beta/rootfs/etc/services.d/nginx/run
Normal file → Executable file
0
portainer/rootfs/etc/services.d/nginx/run
Normal file → Executable file
0
portainer/rootfs/etc/services.d/nginx/run
Normal file → Executable file
0
portainer/rootfs/etc/services.d/portainer/run
Normal file → Executable file
0
portainer/rootfs/etc/services.d/portainer/run
Normal file → Executable file
Reference in New Issue
Block a user