Merge branch 'main' into all-contributors/add-wi5nia

Author: janiceilene

.github/allowed-actions.js

@@ -23,7 +23,7 @@ module.exports = [
   'juliangruber/approve-pull-request-action@v1',
   'juliangruber/find-pull-request-action@v1',
   'juliangruber/read-file-action@v1',
-  'pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a',
+  'pascalgn/automerge-action@c9bd182',
   'peter-evans/create-issue-from-file@v2',
   'peter-evans/create-pull-request@v2',
   'rachmari/actions-add-new-issue-to-column@v1.1.1',

.github/workflows/automerge.yml

@@ -20,18 +20,17 @@ on:
 jobs:
   automerge:
     runs-on: ubuntu-latest
-    if: contains(github.event.pull_request.labels.*.name, 'automerge')
+    if: contains(github.event.pull_request.labels.*.name, 'automerge') || contains(github.event.pull_request.labels.*.name, 'autosquash')
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a"
+        uses: "pascalgn/automerge-action@c9bd182"
         env:
           GITHUB_TOKEN: "${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}"
-          MERGE_LABELS: "automerge"
-          MERGE_REMOVE_LABELS: ""
+          MERGE_METHOD_LABELS: "automerge=merge,autosquash=squash"
           MERGE_COMMIT_MESSAGE: "pull-request-title"
           MERGE_METHOD: "merge"
           MERGE_FORKS: "true"
           MERGE_RETRIES: "50"
-          MERGE_RETRY_SLEEP: "10000"
-          UPDATE_LABELS: "automerge"
+          MERGE_RETRY_SLEEP: "10000" # ten seconds
+          UPDATE_LABELS: "automerge,autosquash"
           UPDATE_METHOD: "merge"

.github/workflows/autosquash.yml

@@ -35,7 +35,7 @@ async function airtablePost (req, res, next) {
     return res.status(201).send({ id: records[0].getId() })
   } catch (err) {
     console.error('unable to POST event', err)
-    return res.status(err.statusCode).send(err)
+    return res.status(502).send({})
   }
 }
 
@@ -52,11 +52,11 @@ router.post('/', async (req, res, next) => {
   const fields = omit(req.body, OMIT_FIELDS)
   try {
     const hydroRes = await req.hydro.publish(req.hydro.schemas[req.body.type], fields)
-    if (!hydroRes.ok) return res.status(500).json({})
+    if (!hydroRes.ok) return res.status(502).json({})
     return res.status(201).json(fields)
   } catch (err) {
     if (process.env.NODE_ENV === 'development') console.log(err)
-    return res.status(500).json({})
+    return res.status(502).json({})
   }
 })
 
@@ -82,7 +82,7 @@ router.put('/:id', async (req, res, next) => {
     return res.status(200).send({})
   } catch (err) {
     console.error('unable to PUT event', err)
-    return res.status(err.statusCode).send(err)
+    return res.status(502).send({})
   }
 })