Merge branch 'main' into bug6048

2026-09-21 21:25:38 +00:00 · 2024-08-23 09:37:59 +02:00
parent 2ffb3e7b5f 93c4f84f75
commit 4700ce2d05
11 changed files with 23 additions and 5 deletions
@@ -24,8 +24,16 @@ jobs:
          chmod 600 ~/.ssh/id_ed25519
          git remote add sapsailing ssh://trac@sapsailing.com/home/trac/git
          git remote -v
-          GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git fetch sapsailing
-          git config --global user.email "github@sapsailing.com"
-          git config --global user.name "Github Auto-Merger"
-          git merge sapsailing/main
-          git push
+          GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git fetch sapsailing main:sapsailing_main
+          GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git push -f origin sapsailing_main:sapsailing_main
+      - name: Merge sapsailing/main into main
+        uses: devmasx/merge-branch@master
+        env: 
+          GH_TOKEN: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}
+        with:
+          type: now 
+          from_branch: sapsailing_main
+          target_branch: main
+          message: Auto-merging sapsailing/main into github/main
+          github_token: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}
+
@@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Závodníci na výsledkových tabulích
 SmoothedSpeed=Vyhlazená rychlost
 RatioDistanceLongVsShortTack=Poměr délky dlouhého/krátkého obratu
 RatioDurationLongVsShortTack=Poměr doby trvání dlouhého/krátkého obratu
+Discarded=Vyřazeno
@@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Deltagere på rangliste
 SmoothedSpeed=Udjævnet hastighed
 RatioDistanceLongVsShortTack=Forholdsafstand lang stagvende/kort stagvende
 RatioDurationLongVsShortTack=Forholdsvarighed lang stagvende/kort stagvende
+Discarded=Kasseret
@@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Competidores en tablas de clasificación
 SmoothedSpeed=Velocidad suavizada
 RatioDistanceLongVsShortTack=Ratio de distancia de bordo largo/corto
 RatioDurationLongVsShortTack=Ratio de duración de bordo largo/corto
+Discarded=Rechazado
@@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Concurrents dans les palmarès
 SmoothedSpeed=Vitesse lissée
 RatioDistanceLongVsShortTack=Ratio de distance tronçon long/tronçon court
 RatioDurationLongVsShortTack=Ratio de durée tronçon long/tronçon court
+Discarded=Retiré
@@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Concorrenti nelle classifiche
 SmoothedSpeed=Velocità media di movimento
 RatioDistanceLongVsShortTack=Distanza in rapporto tra bordo lungo/corto
 RatioDurationLongVsShortTack=Durata in rapporto tra bordo lungo/corto
+Discarded=Scartato
@@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=リーダーボード上の競技者
 SmoothedSpeed=平滑化速度
 RatioDistanceLongVsShortTack=ロングタック/ショートタック距離比率
 RatioDurationLongVsShortTack=ロングタック/ショートタック時間比率
+Discarded=破棄済み
@@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Competidores nos painéis de classificaç
 SmoothedSpeed=Velocidade suavizada
 RatioDistanceLongVsShortTack=Proporção distância cambada longa/cambada curta
 RatioDurationLongVsShortTack=Proporção duração cambada longa/cambada curta
+Discarded=Descartado
@@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Участники в таблицах л
 SmoothedSpeed=Сглаженная скорость
 RatioDistanceLongVsShortTack=Соотношение расстояния длинного и короткого галса
 RatioDurationLongVsShortTack=Соотношение продолжительности длинного и короткого галса
+Discarded=Сброшено
@@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=Tekmovalci na lestvicah vodilnih
 SmoothedSpeed=Umirjena hitrost
 RatioDistanceLongVsShortTack=Razmerje razdalje dolgo prečenje/kratko prečenje
 RatioDurationLongVsShortTack=Razmerje trajanja dolgo prečenje/kratko prečenje
+Discarded=Opuščeno
@@ -272,3 +272,4 @@ CompetitorSailingDomainRetrieverChain=积分榜中的参赛队
 SmoothedSpeed=平滑速度
 RatioDistanceLongVsShortTack=长程迎风转向/短程迎风转向距离比率
 RatioDurationLongVsShortTack=长程迎风转向/短程迎风转向持续时间比率
+Discarded=已放弃