Merge pull request #50 from Stefterv/main

Further simplification

Author: Stefterv

.github/workflows/issue_to_pr.yml

@@ -12,12 +12,14 @@ permissions:
 
 jobs:
   validate:
+    name: Validate .properties File and Create a submission Pull Request 
     # Only run this job if the issue has the 'new contribution' label
     if: contains(github.event.issue.labels.*.name, 'new contribution')
     runs-on: ubuntu-latest
-    outputs:
-      props: ${{ steps.parseProps.outputs.props }}
-      comment-id: ${{ steps.issueComment.outputs.comment-id }}
+    env:
+      BRANCH_NAME: issue-${{ github.event.issue.number }}
+      ISSUE_NUM: ${{ github.event.issue.number }}
+      ISSUE_TITLE: ${{ github.event.issue.title }}
     steps:
       - name: Parse issue
         id: parseIssue
@@ -48,6 +50,7 @@ jobs:
 
       - name: add comment to issue
         id: issueComment
+        if: success()
         uses: peter-evans/create-or-update-comment@v4
         with:
           issue-number: ${{ github.event.issue.number }}
@@ -65,26 +68,6 @@ jobs:
             Please ensure that the URL is correct and the file follows the required format.
 
             ${{ steps.parseProps.outputs.error }}
-  create-pr:
-    # Only run this job if the issue has the 'new contribution' label
-    if: contains(github.event.issue.labels.*.name, 'new contribution')
-    needs: validate
-    env:
-      BRANCH_NAME: issue-${{ github.event.issue.number }}
-      ISSUE_NUM: ${{ github.event.issue.number }}
-      ISSUE_TITLE: ${{ github.event.issue.title }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-
-      - name: Install dependencies
-        run: pip install -r requirements.txt
 
       - name: check if target branch exists
         id: branchExists
@@ -107,24 +90,27 @@ jobs:
       - name: edit database
         run: |
           cd scripts
-          python add_new_contribution_to_yaml.py '${{ needs.validate.outputs.props }}'
+          python add_new_contribution_to_yaml.py '${{ steps.parseProps.outputs.props }}'
 
       - name: commit changes
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: new contribution from issue ${{ env.ISSUE_NUM }}
+          commit_message: adding contribution ${{ github.event.issue.title }} from #${{ github.event.issue.number }}
           branch: ${{ env.BRANCH_NAME }}
           add_options: '-u'
 
       - name: Create pull request
-        run: gh pr create -B main -H $BRANCH_NAME --title "new contribution issue $ISSUE_NUM" --body "${{github.event.issue.title }}"
+        run: |
+          gh pr create -B main -H $BRANCH_NAME --title "Adding ${{ github.event.issue.title }}" --body "This pull request will add ${{ github.event.issue.title }}
+          
+          and it closes \#${{ github.event.issue.number }}"
         env:
           GH_TOKEN: ${{ github.token }}
 
       - name: add comment to issue
         uses: peter-evans/create-or-update-comment@v4
         with:
-          comment-id: ${{ needs.validate.outputs.comment-id }}
+          comment-id:  ${{ steps.issueComment.outputs.comment-id }}
           body: |
             A pull request with your contribution has been successfully created.
 
@@ -133,8 +119,8 @@ jobs:
         if: failure()
         uses: peter-evans/create-or-update-comment@v4
         with:
-          comment-id: ${{ needs.validate.outputs.comment-id }}
+          comment-id:  ${{ steps.issueComment.outputs.comment-id }}
           body: |
             An error was encountered when adding your contribution.
 
-            We will look into this issue as soon as possible. Please check the details of your submission and try again if necessary.
+            We will look into this issue as soon as possible. Please check the details of your submission and try again if necessary.