Merge branch '5.x' into rest-api-getting-started-page

mautic · Oct 24, 2024 · af4c574 · af4c574
2 parents dbb11a1 + 07cef2f
commit af4c574
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 40 deletions.
diff --git a/.github/styles/Vocab/Mautic/accept.txt → ...les/config/vocabularies/Mautic/accept.txt b/.github/styles/Vocab/Mautic/accept.txt → ...les/config/vocabularies/Mautic/accept.txt
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -4,48 +4,49 @@ on:
 
 jobs:
   prose:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04  # See https://github.com/errata-ai/vale-action/issues/128 before upgrading
+    permissions:
+      contents: read
+      pull-requests: write
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-        cache: 'pip'
-
-    - name: Install Python dependencies
-      run: pip3 install -r docs/requirements.txt
-
-    - name: Vale
-      uses: errata-ai/vale-action@reviewdog
-      with:
-        # Please keep version in sync with the version in .gitpod.Dockerfile for a consistent experience
-        version: 2.29.2
-        fail_on_error: true
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+          cache: 'pip'
+
+      - name: Install Python dependencies
+        run: pip3 install -r docs/requirements.txt
+
+      - name: Vale
+        uses: errata-ai/vale-action@reviewdog
+        with:
+          version: 3.7.1  # Please keep version in sync with the version in .gitpod.Dockerfile for a consistent experience
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-        cache: 'pip'
-
-    - name: Install Python dependencies
-      run: pip3 install -r docs/requirements.txt
-
-    - name: Build docs
-      working-directory: docs
-      run: make html
-
-    - name: Check links
-      working-directory: docs
-      run: make checklinks
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+          cache: 'pip'
+
+      - name: Install Python dependencies
+        run: pip3 install -r docs/requirements.txt
+      
+      - name: Build docs
+        working-directory: docs
+        run: make html
+
+      - name: Check links
+        working-directory: docs
+        run: make checklinks