Merge branch 'main' into jeffmcaffer-patch-2

.all-contributorsrc

@@ -312,6 +312,16 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "casals",
+      "name": "Arthur Casals",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/785860?v=4",
+      "profile": "https://github.com/casals",
+      "contributions": [
+        "content",
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.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"

README.md

@@ -119,6 +119,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/BenJam"><img src="https://avatars2.githubusercontent.com/u/158833?v=4" width="64px;" alt=""/><br /><sub><b>Benjamin Nickolls</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=BenJam" title="Documentation">📖</a></td>
     <td align="center"><a href="https://mcaffer.com"><img src="https://avatars2.githubusercontent.com/u/10070956?v=4" width="64px;" alt=""/><br /><sub><b>Jeff McAffer</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=jeffmcaffer" title="Documentation">📖</a></td>
     <td align="center"><a href="https://tjenkinson.me"><img src="https://avatars0.githubusercontent.com/u/3259993?v=4" width="64px;" alt=""/><br /><sub><b>Tom Jenkinson</b></sub></a><br /><a href="https://github.com/github/docs/commits?author=tjenkinson" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/casals"><img src="https://avatars0.githubusercontent.com/u/785860?v=4" width="64px;" alt=""/><br /><sub><b>Arthur Casals</b></sub></a><br /><a href="#content-casals" title="Content">🖋</a> <a href="https://github.com/github/docs/commits?author=casals" title="Documentation">📖</a></td>
   </tr>
 </table>
 

content/actions/learn-github-actions/index.md

@@ -37,5 +37,6 @@ versions:
 {% link_with_intro /sharing-workflows-with-your-organization %}
 {% link_with_intro /security-hardening-for-github-actions %}
 {% link_with_intro /migrating-from-circleci-to-github-actions %}
+{% link_with_intro /migrating-from-gitlab-cicd-to-github-actions %}
 {% link_with_intro /migrating-from-azure-pipelines-to-github-actions %}
 {% link_with_intro /migrating-from-jenkins-to-github-actions %}