Addressing comments

rsksmart · Oct 11, 2024 · bfd7e07 · bfd7e07
1 parent 0054f4a
commit bfd7e07
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/.github/workflows/rit.yml b/.github/workflows/rit.yml
@@ -132,7 +132,11 @@ jobs:
               "attachments": [
                 {
                   "color": "good",
+<<<<<<< Updated upstream
                   "text": "OK: :white_tick:  *Pull request*: ${{ env.SAFE_BRANCH_NAME }} - [#${{ github.run_number }} - *${{ github.event.pull_request.title }}*] - PR: ${{ github.event.pull_request.html_url }} - (${{ env.BUILD_URL }}) - *Branches used* [rskj:`rsksmart#${{ env.RSKJ_BRANCH }}`] [fed:`${{ env.POWPEG_BRANCH }}`] [rootstock-integration-tests:`${{ env.RIT_BRANCH }}`]"
+=======
+                  "text": "*PASSED*: :white_check_mark:  *Pull request*: ${{ env.SAFE_BRANCH_NAME }} \n#${{ github.run_number }} - *${{ github.event.pull_request.title }}*] - PR: ${{ github.event.pull_request.html_url }} \n*Pipeline: ${{ env.BUILD_URL }}) \n*Branches used* \n- rskj:`${{ env.RSKJ_BRANCH }}` \n- fed:`${{ env.POWPEG_BRANCH }}` \n- rootstock-integration-tests:`${{ env.RIT_BRANCH }}`"
+>>>>>>> Stashed changes
                 }
               ]
             }
@@ -149,7 +153,11 @@ jobs:
               "attachments": [
                 {
                   "color": "danger",
+<<<<<<< Updated upstream
                   "text": "FAILED: :x: *Pull request*: ${{ env.SAFE_BRANCH_NAME }} - [#${{ github.run_number }} - *${{ github.event.pull_request.title }}*] - PR: ${{ github.event.pull_request.html_url }} - (${{ env.BUILD_URL }}) - *Branches used* [rskj:`rsksmart#${{ env.RSKJ_BRANCH }}`] [fed:`${{ env.POWPEG_BRANCH }}`] [rootstock-integration-tests:`${{ env.RIT_BRANCH }}`]"
+=======
+                  "text": "*FAILED*: :robot_face: *Pull request*: ${{ env.SAFE_BRANCH_NAME }} \n#${{ github.run_number }} - *${{ github.event.pull_request.title }}* \n*PR*: ${{ github.event.pull_request.html_url }} \n*Pipeline*: ${{ env.BUILD_URL }}) \n*Branches used*: \n- rskj:`${{ env.RSKJ_BRANCH }}` \n- fed:`${{ env.POWPEG_BRANCH }}` \n- rootstock-integration-tests:`${{ env.RIT_BRANCH }}`"
+>>>>>>> Stashed changes
                 }
               ]
             }