From 6f7473dbeaecc7f8180319fbb7ed7e5300e7c626 Mon Sep 17 00:00:00 2001 From: pombas_n Date: Thu, 17 Sep 2026 10:26:34 +0200 Subject: [PATCH] Update .gitea/workflows/deployProduction.yml --- .gitea/workflows/deployProduction.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deployProduction.yml b/.gitea/workflows/deployProduction.yml index a591cd9..6d45221 100644 --- a/.gitea/workflows/deployProduction.yml +++ b/.gitea/workflows/deployProduction.yml @@ -41,9 +41,9 @@ jobs: echo "Repository:" git remote -v - echo "docker-compose.yaml:" - cat docker-compose.yaml - + git remote add upstream https://oauth2:${GIT_TOKEN}@gitea.psi.ch/linux/WebHosting_DMZ.git + git fetch upstream + git rebase upstream/main - name: Change versions env: PSITRAIL_VERSION: ${{ inputs.psitrail_version }} -- 2.54.0