Update repo with template version v1.2.3

.gitea/workflows/ci.yml

@@ -28,7 +28,7 @@ on:
         description: "Python version to use"
         required: false
         type: string
-        default: "3.11"
+        default: "3.12"
 
 permissions:
   pull-requests: write
@@ -44,7 +44,18 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: "${{ inputs.PYTHON_VERSION || '3.11' }}"
+          python-version: "${{ inputs.PYTHON_VERSION || '3.12' }}"
+
+      - name: Checkout BEC Plugin Repository
+        uses: actions/checkout@v4
+        with:
+          repository: bec/bec_testing_plugin
+          ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.head_ref || github.sha }}"
+          path: ./bec_testing_plugin
+
+      - name: Lint for merge conflicts
+        run: |
+          
 
       - name: Checkout BEC Core
         uses: actions/checkout@v4
@@ -67,13 +78,6 @@ jobs:
           ref: "${{ inputs.BEC_WIDGETS_BRANCH || 'main' }}"
           path: ./bec_widgets
 
-      - name: Checkout BEC Plugin Repository
-        uses: actions/checkout@v4
-        with:
-          repository: bec/bec_testing_plugin
-          ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.head_ref || github.sha }}"
-          path: ./bec_testing_plugin
-
       - name: Install dependencies
         shell: bash
         run: |

.gitea/workflows/create_update_pr.yml

@@ -6,11 +6,16 @@ permissions:
   pull-requests: write
 
 jobs:
+<<<<<<< before updating
   create_update_branch_and_pr:
     runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
+=======
+  test:
+    runs-on: ubuntu-latest
+>>>>>>> after updating
 
     steps:
       - name: Setup Python
@@ -20,13 +25,18 @@ jobs:
     
       - name: Install tools
         run: |
+<<<<<<< before updating
           pip install copier PySide6
+=======
+          pip install copier
+>>>>>>> after updating
 
       - name: Checkout
         uses: actions/checkout@v4
     
       - name: Perform update
         run: |
+<<<<<<< before updating
           set -x
           git config --global user.email "bec_ci_staging@psi.ch"
           git config --global user.name "BEC automated CI"
@@ -61,3 +71,11 @@ jobs:
                   \"head\": \"$(echo $branch)\",
                   \"base\": \"main\"
                 }"
+=======
+          branch="chore/update-template-$(python -m uuid)"
+          git checkout -b $branch
+          msg = $(copier update --trust --defaults --conflict inline 2>&1 | sed -n 1p)
+          git add -A
+          git diff-index --quiet HEAD || git commit -a -m $msg
+          git push -u origin $branch
+>>>>>>> after updating