DEBUG: fix merge

Author: sfc-gh-pczajka

.github/workflows/build_test.yml

@@ -2,12 +2,16 @@ name: Build and Test
 
 on:
     push:
+<<<<<<< HEAD
         branches:
             - master
             - main
             - dev/aio-connector
         tags:
             - v*
+=======
+
+>>>>>>> b9198320 (DEBUG: fix merge)
     pull_request:
         branches:
             - master
@@ -306,6 +310,15 @@ jobs:
   #         path: |
   #           .coverage
   #           coverage.xml
+<<<<<<< HEAD
+=======
+      # - uses: actions/upload-artifact@v4
+      #   with:
+      #     include-hidden-files: true
+      #     name: junit_linux-fips-3.9-${{ matrix.cloud-provider }}
+      #     path: |
+      #       junit.*.xml
+>>>>>>> b9198320 (DEBUG: fix merge)
 
   # test-lambda:
   #   name: Test Lambda linux-${{ matrix.python-version }}-${{ matrix.cloud-provider }}
@@ -476,8 +489,28 @@ jobs:
   #         dst_dir.mkdir()
   #         for src_file in src_dir.glob("*/.coverage"):
   #             dst_file = dst_dir / ".coverage.{}".format(src_file.parent.name[9:])
+<<<<<<< HEAD
   #             print("{} copy to {}".format(src_file, dst_file))
   #             shutil.copy(str(src_file), str(dst_file))'
+=======
+      #         print("{} copy to {}".format(src_file, dst_file))
+      #         shutil.copy(str(src_file), str(dst_file))'
+      # - name: Collect all JUnit XML files to one dir
+      #   run: |
+      #     python -c '
+      #     from pathlib import Path
+      #     import shutil
+
+      #     src_dir = Path("artifacts")
+      #     dst_dir = Path(".") / "junit_results"
+      #     dst_dir.mkdir()
+      #     # Collect all JUnit XML files with different naming patterns
+      #     for pattern in ["*/junit.*.xml", "*/junit.py*-lambda-ci-dev.xml"]:
+      #         for src_file in src_dir.glob(pattern):
+      #             dst_file = dst_dir / src_file.name
+      #             print("{} copy to {}".format(src_file, dst_file))
+      #             shutil.copy(str(src_file), str(dst_file))'
+>>>>>>> b9198320 (DEBUG: fix merge)
   #     - name: Combine coverages
   #       run: python -m tox run -e coverage
   #     - name: Publish html coverage
@@ -496,3 +529,12 @@ jobs:
   #       with:
   #         files: .tox/coverage.xml
   #         token: ${{ secrets.CODECOV_TOKEN }}
+<<<<<<< HEAD
+=======
+      # - name: Upload test results to Codecov
+      #   if: ${{ !cancelled() }}
+      #   uses: codecov/test-results-action@v1
+      #   with:
+      #     token: ${{ secrets.CODECOV_TOKEN }}
+      #     files: junit_results/junit.*.xml
+>>>>>>> b9198320 (DEBUG: fix merge)