From 34c361d3f81732fd3d768cb7e75fcc4a01b1c059 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 15 May 2026 14:01:22 +0200 Subject: [PATCH] Test Backporting Signed-off-by: Chaoscaot --- .gitea/workflows/backport-commoncore.yml | 3 +-- .gitea/workflows/pull-request-build.yml | 2 +- CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.kt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/backport-commoncore.yml b/.gitea/workflows/backport-commoncore.yml index b20e8324..5f53da29 100644 --- a/.gitea/workflows/backport-commoncore.yml +++ b/.gitea/workflows/backport-commoncore.yml @@ -127,7 +127,7 @@ jobs: failures=() for target_branch in "${version_branches[@]}"; do safe_target="$(sed -E 's#[^A-Za-z0-9._-]+#-#g; s#^-+##; s#-+$##' <<< "$target_branch")" - head_branch="backport/pr-${pr_number}-to-${safe_target}" + head_branch="backport-pr-${pr_number}-to-${safe_target}" existing_pr="$(api GET "${repo_path}/pulls?state=open&base_branch=$(jq -rn --arg value "$target_branch" '$value|@uri')&limit=50" | jq -r --arg head "$head_branch" '.[] | select(.head.ref == $head) | .number' | @@ -188,7 +188,6 @@ jobs: -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 diff --git a/.gitea/workflows/pull-request-build.yml b/.gitea/workflows/pull-request-build.yml index aac640f7..b67c37c9 100644 --- a/.gitea/workflows/pull-request-build.yml +++ b/.gitea/workflows/pull-request-build.yml @@ -44,7 +44,7 @@ jobs: name: Merge backport runs-on: ubuntu-latest needs: build - if: ${{ startsWith(github.event.pull_request.base.ref, 'version/') && startsWith(github.event.pull_request.head.ref, 'backport/pr-') }} + if: ${{ startsWith(github.event.pull_request.base.ref, 'version/') && startsWith(github.event.pull_request.head.ref, 'backport-pr-') }} permissions: contents: write issues: write diff --git a/CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.kt b/CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.kt index 7d2753f6..dddd8191 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.kt +++ b/CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.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