From f888e928082d255d4dba976a68bdfde7ea2a1caa Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Fri, 17 Nov 2023 10:18:12 -0500 Subject: [PATCH 01/20] added credits.md and update-credits.yml --- credits.md | 0 update-credits.yml | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 credits.md create mode 100644 update-credits.yml diff --git a/credits.md b/credits.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/update-credits.yml b/update-credits.yml new file mode 100644 index 0000000000..e918176ad5 --- /dev/null +++ b/update-credits.yml @@ -0,0 +1,20 @@ +name: Update Credits upon opening PR +on: + pull_request: + types: + - opened + +jobs: + update-credits: + runs-on: ubuntu-latest + + steps: + - name: Checkout Code + uses: actions/checkout@v2 + + - name: Update Credits + run: | + contributor="${{ github.event.pull_request.user.login }}" + echo "- $contributor" >> credits.md + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From de1d69bab9ae533406f77341a654f4dda64b5a2d Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Fri, 17 Nov 2023 10:23:42 -0500 Subject: [PATCH 02/20] updated update-credits.yml --- update-credits.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/update-credits.yml b/update-credits.yml index e918176ad5..505bf2fd6d 100644 --- a/update-credits.yml +++ b/update-credits.yml @@ -1,20 +1,31 @@ name: Update Credits upon opening PR + on: pull_request: types: - opened + - synchronize jobs: update-credits: runs-on: ubuntu-latest steps: - - name: Checkout Code + - name: Checkout Repository uses: actions/checkout@v2 - name: Update Credits run: | - contributor="${{ github.event.pull_request.user.login }}" - echo "- $contributor" >> credits.md - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + contributor_name=$(jq -r '.pull_request.user.login' $GITHUB_EVENT_PATH) + pr_description=$(jq -r '.pull_request.body' $GITHUB_EVENT_PATH) + + echo "### Contributor: $contributor_name" >> credits.md + echo "#### PR Description:" >> credits.md + echo "$pr_description" >> credits.md + echo "" >> credits.md + + git add credits.md + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + git commit -m "Update credits.md with contributor information" || exit 0 + git push From 31f69eaef852c3c7c61beb55f020d3061c6a113c Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Fri, 17 Nov 2023 10:44:01 -0500 Subject: [PATCH 03/20] updated update-credits.yml and credits.md --- credits.md => .github/credits.md | 0 update-credits.yml => .github/update-credits.yml | 13 +++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) rename credits.md => .github/credits.md (100%) rename update-credits.yml => .github/update-credits.yml (59%) diff --git a/credits.md b/.github/credits.md similarity index 100% rename from credits.md rename to .github/credits.md diff --git a/update-credits.yml b/.github/update-credits.yml similarity index 59% rename from update-credits.yml rename to .github/update-credits.yml index 505bf2fd6d..2e9fdfd16d 100644 --- a/update-credits.yml +++ b/.github/update-credits.yml @@ -19,13 +19,18 @@ jobs: contributor_name=$(jq -r '.pull_request.user.login' $GITHUB_EVENT_PATH) pr_description=$(jq -r '.pull_request.body' $GITHUB_EVENT_PATH) - echo "### Contributor: $contributor_name" >> credits.md - echo "#### PR Description:" >> credits.md - echo "$pr_description" >> credits.md - echo "" >> credits.md + echo "### Timestamp:" >> credits.md + echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> credits.md + echo "### Contributor:" >> credits.md + echo "${{ github.event.pull_request.user.login }}" >> credits.md + echo "#### PR Title:" >> credits.md + echo "${{ github.event.pull_request.title }}" >> credits.md + echo "############################################" >> credits.md git add credits.md git config --local user.email "action@github.com" git config --local user.name "GitHub Action" git commit -m "Update credits.md with contributor information" || exit 0 git push + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 743a21f8af98147ed356a400b902f79b83ff06d6 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Fri, 17 Nov 2023 10:52:41 -0500 Subject: [PATCH 04/20] refactored file paths --- .github/{ => workflows}/credits.md | 0 .github/{ => workflows}/update-credits.yml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/credits.md (100%) rename .github/{ => workflows}/update-credits.yml (100%) diff --git a/.github/credits.md b/.github/workflows/credits.md similarity index 100% rename from .github/credits.md rename to .github/workflows/credits.md diff --git a/.github/update-credits.yml b/.github/workflows/update-credits.yml similarity index 100% rename from .github/update-credits.yml rename to .github/workflows/update-credits.yml From 68a352e4030f0f4c5ee4354a68508d5910ca8522 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Sun, 19 Nov 2023 11:27:37 -0500 Subject: [PATCH 05/20] refactored directory --- .github/{workflows => }/credits.md | 0 .../{update-credits.yml => update_credits.yml} | 16 ++++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) rename .github/{workflows => }/credits.md (100%) rename .github/workflows/{update-credits.yml => update_credits.yml} (68%) diff --git a/.github/workflows/credits.md b/.github/credits.md similarity index 100% rename from .github/workflows/credits.md rename to .github/credits.md diff --git a/.github/workflows/update-credits.yml b/.github/workflows/update_credits.yml similarity index 68% rename from .github/workflows/update-credits.yml rename to .github/workflows/update_credits.yml index 2e9fdfd16d..ff216d9dba 100644 --- a/.github/workflows/update-credits.yml +++ b/.github/workflows/update_credits.yml @@ -19,18 +19,18 @@ jobs: contributor_name=$(jq -r '.pull_request.user.login' $GITHUB_EVENT_PATH) pr_description=$(jq -r '.pull_request.body' $GITHUB_EVENT_PATH) - echo "### Timestamp:" >> credits.md - echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> credits.md - echo "### Contributor:" >> credits.md - echo "${{ github.event.pull_request.user.login }}" >> credits.md - echo "#### PR Title:" >> credits.md - echo "${{ github.event.pull_request.title }}" >> credits.md - echo "############################################" >> credits.md + echo "### Timestamp:" >> .github/credits.md + echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> .github/credits.md + echo "### Contributor:" >> .github/credits.md + echo "${{ github.event.pull_request.user.login }}" >> .github/credits.md + echo "#### PR Title:" >> .github/credits.md + echo "${{ github.event.pull_request.title }}" >> .github/credits.md + echo "############################################" >> .github/credits.md git add credits.md git config --local user.email "action@github.com" git config --local user.name "GitHub Action" git commit -m "Update credits.md with contributor information" || exit 0 - git push + git push origin HEAD: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From c016fb2d086f81c61d39fb617b2d8e9c1c2a5c24 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Sun, 19 Nov 2023 11:37:14 -0500 Subject: [PATCH 06/20] updated update_credits.yml --- .github/workflows/update_credits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_credits.yml b/.github/workflows/update_credits.yml index ff216d9dba..8b07186e50 100644 --- a/.github/workflows/update_credits.yml +++ b/.github/workflows/update_credits.yml @@ -27,7 +27,7 @@ jobs: echo "${{ github.event.pull_request.title }}" >> .github/credits.md echo "############################################" >> .github/credits.md - git add credits.md + git add .github/credits.md git config --local user.email "action@github.com" git config --local user.name "GitHub Action" git commit -m "Update credits.md with contributor information" || exit 0 From c13f455e597942aceec7c16dce63b074413a0bf7 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Sun, 19 Nov 2023 14:10:47 -0500 Subject: [PATCH 07/20] Fix error --- .github/workflows/update_credits.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update_credits.yml b/.github/workflows/update_credits.yml index 8b07186e50..1df9722b4a 100644 --- a/.github/workflows/update_credits.yml +++ b/.github/workflows/update_credits.yml @@ -18,7 +18,7 @@ jobs: run: | contributor_name=$(jq -r '.pull_request.user.login' $GITHUB_EVENT_PATH) pr_description=$(jq -r '.pull_request.body' $GITHUB_EVENT_PATH) - + echo "### Timestamp:" >> .github/credits.md echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> .github/credits.md echo "### Contributor:" >> .github/credits.md @@ -26,11 +26,11 @@ jobs: echo "#### PR Title:" >> .github/credits.md echo "${{ github.event.pull_request.title }}" >> .github/credits.md echo "############################################" >> .github/credits.md - + git add .github/credits.md git config --local user.email "action@github.com" git config --local user.name "GitHub Action" git commit -m "Update credits.md with contributor information" || exit 0 - git push origin HEAD: + git push origin ${{ github.event.pull_request.head.ref }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 68e62f76efccddfc19a1de4c42f1a36172fae4d7 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Sun, 19 Nov 2023 14:17:35 -0500 Subject: [PATCH 08/20] Test fix --- .github/workflows/update_credits.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update_credits.yml b/.github/workflows/update_credits.yml index 1df9722b4a..8e17ebb6d7 100644 --- a/.github/workflows/update_credits.yml +++ b/.github/workflows/update_credits.yml @@ -9,13 +9,9 @@ on: jobs: update-credits: runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Update Credits - run: | + - uses: actions/checkout@v2 + - run: | contributor_name=$(jq -r '.pull_request.user.login' $GITHUB_EVENT_PATH) pr_description=$(jq -r '.pull_request.body' $GITHUB_EVENT_PATH) From d9202199667d5fc1cbe0fea10ed95477389335e7 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Sun, 19 Nov 2023 14:31:15 -0500 Subject: [PATCH 09/20] Test fix --- .github/workflows/update_credits.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update_credits.yml b/.github/workflows/update_credits.yml index 8e17ebb6d7..601f5ea501 100644 --- a/.github/workflows/update_credits.yml +++ b/.github/workflows/update_credits.yml @@ -2,6 +2,8 @@ name: Update Credits upon opening PR on: pull_request: + branches: + - master types: - opened - synchronize @@ -10,7 +12,9 @@ jobs: update-credits: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.ref }} - run: | contributor_name=$(jq -r '.pull_request.user.login' $GITHUB_EVENT_PATH) pr_description=$(jq -r '.pull_request.body' $GITHUB_EVENT_PATH) @@ -26,7 +30,7 @@ jobs: git add .github/credits.md git config --local user.email "action@github.com" git config --local user.name "GitHub Action" - git commit -m "Update credits.md with contributor information" || exit 0 + git commit -m "Update credits.md with contributor information" git push origin ${{ github.event.pull_request.head.ref }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 6756a4665cffd019525da545c5adb70dab0b4a39 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 19 Nov 2023 19:31:45 +0000 Subject: [PATCH 10/20] Update credits.md with contributor information --- .github/credits.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/credits.md diff --git a/.github/credits.md b/.github/credits.md new file mode 100644 index 0000000000..97b407c6e8 --- /dev/null +++ b/.github/credits.md @@ -0,0 +1,7 @@ +### Timestamp: +2023-11-19T19:31:45Z +### Contributor: +qcdyx +#### PR Title: +feat: Sidecar jlu +############################################ From 67c71ff0cee4804514701a2c6df3cd0562c88e7f Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Sun, 19 Nov 2023 14:47:15 -0500 Subject: [PATCH 11/20] updated update_credits.yml --- .github/workflows/update_credits.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update_credits.yml b/.github/workflows/update_credits.yml index 601f5ea501..3c13100062 100644 --- a/.github/workflows/update_credits.yml +++ b/.github/workflows/update_credits.yml @@ -1,20 +1,20 @@ -name: Update Credits upon opening PR +name: Update Credits upon merging PR on: pull_request: branches: - master types: - - opened - - synchronize + - closed jobs: update-credits: runs-on: ubuntu-latest + if: github.event.pull_request.merged == true steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.pull_request.head.ref }} + ref: master - run: | contributor_name=$(jq -r '.pull_request.user.login' $GITHUB_EVENT_PATH) pr_description=$(jq -r '.pull_request.body' $GITHUB_EVENT_PATH) @@ -31,6 +31,6 @@ jobs: git config --local user.email "action@github.com" git config --local user.name "GitHub Action" git commit -m "Update credits.md with contributor information" - git push origin ${{ github.event.pull_request.head.ref }} + git push origin master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From e804aa2862da89cb40a3cfa81bc67e869935d959 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 20 Nov 2023 11:41:26 -0500 Subject: [PATCH 12/20] updated update_credits.yml --- .github/workflows/update_credits.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/update_credits.yml b/.github/workflows/update_credits.yml index 3c13100062..1122c0a267 100644 --- a/.github/workflows/update_credits.yml +++ b/.github/workflows/update_credits.yml @@ -2,30 +2,24 @@ name: Update Credits upon merging PR on: pull_request: - branches: - - master types: - - closed + - opened jobs: update-credits: runs-on: ubuntu-latest - if: github.event.pull_request.merged == true steps: - uses: actions/checkout@v4 with: ref: master - run: | - contributor_name=$(jq -r '.pull_request.user.login' $GITHUB_EVENT_PATH) - pr_description=$(jq -r '.pull_request.body' $GITHUB_EVENT_PATH) - echo "### Timestamp:" >> .github/credits.md echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> .github/credits.md echo "### Contributor:" >> .github/credits.md echo "${{ github.event.pull_request.user.login }}" >> .github/credits.md echo "#### PR Title:" >> .github/credits.md echo "${{ github.event.pull_request.title }}" >> .github/credits.md - echo "############################################" >> .github/credits.md + echo "########################################################################################x" >> .github/credits.md git add .github/credits.md git config --local user.email "action@github.com" From 05f5166db3fecd57f6ffc5ba207ddbce06106bc8 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 20 Nov 2023 11:54:26 -0500 Subject: [PATCH 13/20] updated yml file --- .github/credits.md | 0 .github/workflows/update_credits.yml | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 .github/credits.md diff --git a/.github/credits.md b/.github/credits.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/.github/workflows/update_credits.yml b/.github/workflows/update_credits.yml index 1122c0a267..b91b2bb242 100644 --- a/.github/workflows/update_credits.yml +++ b/.github/workflows/update_credits.yml @@ -1,9 +1,12 @@ -name: Update Credits upon merging PR +name: Update Credits upon creating PR on: pull_request: + branches: + - master types: - opened + - synchronize jobs: update-credits: From 8b04ed560538f64e3b4b68dc035345f6ab778d53 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 20 Nov 2023 11:59:26 -0500 Subject: [PATCH 14/20] changes should be pushed on to current branch --- .github/workflows/update_credits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_credits.yml b/.github/workflows/update_credits.yml index b91b2bb242..7c38680eb0 100644 --- a/.github/workflows/update_credits.yml +++ b/.github/workflows/update_credits.yml @@ -28,6 +28,6 @@ jobs: git config --local user.email "action@github.com" git config --local user.name "GitHub Action" git commit -m "Update credits.md with contributor information" - git push origin master + git push origin HEAD env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From fd25fb7bbb6f6dcae0dfa0f99f7eed8f49bc4dde Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 20 Nov 2023 12:06:05 -0500 Subject: [PATCH 15/20] checkout the branch of the pull request and push changes there --- .github/workflows/update_credits.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update_credits.yml b/.github/workflows/update_credits.yml index 7c38680eb0..b60f9f5408 100644 --- a/.github/workflows/update_credits.yml +++ b/.github/workflows/update_credits.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: master + ref: ${{ github.event.pull_request.head.ref }} - run: | echo "### Timestamp:" >> .github/credits.md echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> .github/credits.md @@ -28,6 +28,6 @@ jobs: git config --local user.email "action@github.com" git config --local user.name "GitHub Action" git commit -m "Update credits.md with contributor information" - git push origin HEAD + git push origin ${{ github.event.pull_request.head.ref}} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 8f85ada8c7936481bb2270302c9beb3881f8695a Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 20 Nov 2023 17:06:33 +0000 Subject: [PATCH 16/20] Update credits.md with contributor information --- .github/credits.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/credits.md b/.github/credits.md index 97b407c6e8..0361cd4a1a 100644 --- a/.github/credits.md +++ b/.github/credits.md @@ -5,3 +5,10 @@ qcdyx #### PR Title: feat: Sidecar jlu ############################################ +### Timestamp: +2023-11-20T17:06:33Z +### Contributor: +qcdyx +#### PR Title: +feat: Recognize/Credit Contributors +########################################################################################x From 04152e08f4c1f46e8f4b98fc8d54623f52af9c40 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 20 Nov 2023 12:16:37 -0500 Subject: [PATCH 17/20] put the number of PR into credits.md --- .github/credits.md | 14 -------------- .github/workflows/update_credits.yml | 2 ++ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/credits.md b/.github/credits.md index 0361cd4a1a..e69de29bb2 100644 --- a/.github/credits.md +++ b/.github/credits.md @@ -1,14 +0,0 @@ -### Timestamp: -2023-11-19T19:31:45Z -### Contributor: -qcdyx -#### PR Title: -feat: Sidecar jlu -############################################ -### Timestamp: -2023-11-20T17:06:33Z -### Contributor: -qcdyx -#### PR Title: -feat: Recognize/Credit Contributors -########################################################################################x diff --git a/.github/workflows/update_credits.yml b/.github/workflows/update_credits.yml index b60f9f5408..0ec31044a9 100644 --- a/.github/workflows/update_credits.yml +++ b/.github/workflows/update_credits.yml @@ -20,6 +20,8 @@ jobs: echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> .github/credits.md echo "### Contributor:" >> .github/credits.md echo "${{ github.event.pull_request.user.login }}" >> .github/credits.md + echo "#### PR Number:" >> .github/credits.md + echo "${{ github.event.pull_request.number }}" >> .github/credits.md echo "#### PR Title:" >> .github/credits.md echo "${{ github.event.pull_request.title }}" >> .github/credits.md echo "########################################################################################x" >> .github/credits.md From 714ab169e39948083c37cbc36695fc5d8763642e Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 20 Nov 2023 17:17:05 +0000 Subject: [PATCH 18/20] Update credits.md with contributor information --- .github/credits.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/credits.md b/.github/credits.md index e69de29bb2..8bea4e8b85 100644 --- a/.github/credits.md +++ b/.github/credits.md @@ -0,0 +1,9 @@ +### Timestamp: +2023-11-20T17:17:05Z +### Contributor: +qcdyx +#### PR Number: +1602 +#### PR Title: +feat: Added workflow for better Recognize/Credit Contributors +########################################################################################x From 235ec15fbfbda77d9c13a55fbf7b98472d9dd672 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 20 Nov 2023 20:09:14 +0000 Subject: [PATCH 19/20] Update credits.md with contributor information --- .github/credits.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/credits.md b/.github/credits.md index 8bea4e8b85..d9cf158006 100644 --- a/.github/credits.md +++ b/.github/credits.md @@ -7,3 +7,12 @@ qcdyx #### PR Title: feat: Added workflow for better Recognize/Credit Contributors ########################################################################################x +### Timestamp: +2023-11-20T20:09:14Z +### Contributor: +qcdyx +#### PR Number: +1602 +#### PR Title: +feat: Added workflow for better Recognize/Credit Contributors +########################################################################################x From bb19996c477ed5fce84850185f54444fdbf5db72 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 16 Sep 2024 20:29:34 +0000 Subject: [PATCH 20/20] Update credits.md with contributor information --- .github/credits.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/credits.md b/.github/credits.md index d9cf158006..173c05d0dd 100644 --- a/.github/credits.md +++ b/.github/credits.md @@ -16,3 +16,12 @@ qcdyx #### PR Title: feat: Added workflow for better Recognize/Credit Contributors ########################################################################################x +### Timestamp: +2024-09-16T20:29:34Z +### Contributor: +qcdyx +#### PR Number: +1602 +#### PR Title: +feat: Added workflow for better Recognize/Credit Contributors +########################################################################################x