Fix conflicts in nightly.yml

Author: Amronos

.github/workflows/nightly.yml

@@ -10,111 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-<<<<<<< HEAD
-        branch: [rolling, kilted, jazzy, humble]
-        idf_target: [ esp32, esp32s2, esp32c3, esp32s3, esp32c6]
-        idf_version: [ "espressif/idf:release-v4.4", "espressif/idf:release-v5.2" ]
-        exclude:
-          # Skip IDF v4 + ESP32C6 combination
-          - idf_target: esp32c6
-            idf_version: espressif/idf:release-v4.4
-          # Skip IDF v4 for rolling and kilted
-          - branch: rolling
-            idf_version: espressif/idf:release-v4.4
-          - branch: kilted
-            idf_version: espressif/idf:release-v4.4
-
-
-    container:
-      image: ${{ matrix.idf_version }}
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          path: micro_ros_espidf_component
-          ref: ${{ matrix.branch }}
-
-      - name: Dependencies
-        shell: bash
-        run: |
-          apt update
-          export DEBIAN_FRONTEND=noninteractive
-          apt install -y git python3-pip
-          . $IDF_PATH/export.sh
-          pip3 install catkin_pkg lark-parser empy==3.3.4 colcon-common-extensions
-          # This line avoids the error when using Python < 3.7 https://importlib-resources.readthedocs.io/en/latest/
-          pip3 install importlib-resources
-          # this installs the modules also for global python interpreter, needed for IDF v5
-          /usr/bin/pip3 install catkin_pkg lark-parser empy==3.3.4 colcon-common-extensions importlib-resources
-
-      # This line can be removed when https://github.com/colcon/colcon-python-setup-py/issues/56 is solved
-      - name: Patch setuptools
-        shell: bash
-        if: matrix.idf_version == 'espressif/idf:release-v4.4'
-        run: |
-          . $IDF_PATH/export.sh
-          pip3 install setuptools==68.1.2
-
-      - name: Build sample - int32_publisher
-        shell: bash
-        run: |
-          . $IDF_PATH/export.sh
-          cd micro_ros_espidf_component/examples/int32_publisher
-          idf.py set-target ${{ matrix.idf_target }}
-          idf.py build
-
-      - name: Build sample - low_consumption
-        shell: bash
-        if: matrix.idf_target != 'esp32c3' && matrix.idf_target != 'esp32s3' && matrix.idf_target != 'esp32c6'
-        run: |
-          . $IDF_PATH/export.sh
-          cd micro_ros_espidf_component/examples/low_consumption
-          idf.py set-target ${{ matrix.idf_target }}
-          idf.py build
-
-      - name: Build sample - handle_static_types
-        shell: bash
-        run: |
-          . $IDF_PATH/export.sh
-          cd micro_ros_espidf_component/examples/handle_static_types
-          idf.py set-target ${{ matrix.idf_target }}
-          idf.py build
-
-      - name: Build sample - int32_publisher_custom_transport
-        shell: bash
-        run: |
-          . $IDF_PATH/export.sh
-          cd micro_ros_espidf_component
-          make -f libmicroros.mk clean
-          sed -i 's/DRMW_UXRCE_TRANSPORT=udp/DRMW_UXRCE_TRANSPORT=custom/' colcon.meta
-          cd examples/int32_publisher_custom_transport
-          idf.py set-target ${{ matrix.idf_target }}
-          idf.py build
-
-      - name: Build sample - multithread_publisher
-        shell: bash
-        run: |
-          . $IDF_PATH/export.sh
-          cd micro_ros_espidf_component
-          make -f libmicroros.mk clean
-          sed -i 's/DRMW_UXRCE_TRANSPORT=udp/DRMW_UXRCE_TRANSPORT=custom/' colcon.meta
-          cd examples/multithread_publisher
-          idf.py set-target ${{ matrix.idf_target }}
-          idf.py build
-
-      - name: EmbeddedRTPS
-        if: ${{ matrix.branch == 'humble' }}
-        shell: bash
-        run: |
-          . $IDF_PATH/export.sh
-          cd micro_ros_espidf_component
-          make -f libmicroros.mk clean
-          cd examples/int32_publisher_embeddedrtps
-          idf.py set-target ${{ matrix.idf_target }}
-          idf.py build
-=======
         branch: [humble, jazzy, kilted, rolling]
     uses: ./.github/workflows/ci.yml
     with:
       branch: ${{ matrix.branch }}
->>>>>>> d749ff1 (Multiple CI and README.md Improvements (#324))