diff --git a/.gitea/workflows/backport-commoncore.yml b/.gitea/workflows/backport-commoncore.yml index 41c7be36..b20e8324 100644 --- a/.gitea/workflows/backport-commoncore.yml +++ b/.gitea/workflows/backport-commoncore.yml @@ -10,7 +10,6 @@ permissions: contents: write issues: write pull-requests: write - issues: write jobs: backport: @@ -174,35 +173,23 @@ jobs: continue fi - git push origin "HEAD:refs/heads/${head_branch}" --force-with-lease - if [[ "${#source_commits[@]}" -eq 1 ]]; then source_text="Source commit: \`${source_commits[0]}\`" else source_text="Source commits:" for commit in "${source_commits[@]}"; do - source_text="${source_text}"$'\n'"- \`${commit}\`" + source_text="${source_text} \`${commit}\`" done fi - body="$(cat </dev/null + git push \ + -o "topic=${head_branch}" \ + -o "title=Backport #${pr_number} to ${target_branch}: ${pr_title}" \ + -o "description=${description}" \ + -o "force-push" \ + origin "HEAD:refs/for/${target_branch}" echo "Created backport PR from ${head_branch} to ${target_branch}." git checkout main done diff --git a/CommonCore/SQL/src/de/steamwar/sql/BannedUserIPs.kt b/CommonCore/SQL/src/de/steamwar/sql/BannedUserIPs.kt index 4ad7efbe..216fd3dd 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/BannedUserIPs.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/BannedUserIPs.kt @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2025 SteamWar.de-Serverteam + * Copyright (C) 2026 SteamWar.de-Serverteam * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by