updating action and script to include specific label, replace third-p…

…arty action with gh cli to automerge contributions

.github/workflows/verify-contribution.yml

@@ -18,10 +18,12 @@ jobs:
       run: |
         docker build -q -t vocdoni/zk-voceremony --target zk-voceremony .
         docker run --rm -qt --env-file ./ceremony.env vocdoni/zk-voceremony verify
-  merge-contribution:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Auto merge contribution PR
-      uses: "pascalgn/[email protected]"
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    - name: Merge PR branch
+      if: success() && contains(github.event.pull_request.labels.*.name, 'automerge')
+      run: |
+        git config --global user.name "${{ github.actor }}"
+        git config --global user.email "${{ github.actor }}@users.noreply.github.com"
+        git fetch origin ${{ github.base_ref }}
+        git checkout ${{ github.base_ref }}
+        git merge --no-ff ${{ github.head_ref }} -m "Automatically merging new contribution"
+        git push origin ${{ github.base_ref }}

scripts/contribute

@@ -186,7 +186,7 @@ publish_contribution() {
     git add $CONTRIBUTIONS_FILE $CURRENT_CONTRIBUTION_FILE && \
         git commit -m "$CONTRIBUTOR_NAME contribution to '$CEREMONY_BRANCH' ceremony" && \
         git push origin $CEREMONY_BRANCH && \
-        gh pr create --fill --base $CEREMONY_BRANCH -R $GITHUB_REPO_URL
+        gh pr create --fill --base $CEREMONY_BRANCH -R $GITHUB_REPO_URL -l automerge
     echo
     echo "Done! Your contribution has been published!"
     echo