Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream

2026-06-07 14:29:57 +02:00
parent 1c9b6625e2 ead13d4826
commit c2e6cbb12b
166 changed files with 1123 additions and 500 deletions
@@ -22,6 +22,7 @@ on:
 jobs:
  security:
    runs-on: ubuntu-latest
+    timeout-minutes: 15

    env:
      BUNDLE_ONLY: development
@@ -19,6 +19,7 @@ permissions:
 jobs:
  check-i18n:
    runs-on: ubuntu-latest
+    timeout-minutes: 15

    steps:
      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -12,6 +12,7 @@ jobs:
  pathcheck:
    name: Check for relevant changes
    runs-on: ubuntu-latest
+    timeout-minutes: 15
    outputs:
      changed: ${{ steps.filter.outputs.src }}
    steps:
@@ -38,6 +39,7 @@ jobs:
  chromatic:
    name: Run Chromatic
    runs-on: ubuntu-latest
+    timeout-minutes: 15
    needs: pathcheck
    if: github.repository == 'mastodon/mastodon' && needs.pathcheck.outputs.changed == 'true'
    steps:
@@ -17,6 +17,7 @@ jobs:
  analyze:
    name: Analyze
    runs-on: ubuntu-latest
+    timeout-minutes: 15
    permissions:
      actions: read
      contents: read
@@ -10,6 +10,7 @@ on:
 jobs:
  lint:
    runs-on: ubuntu-latest
+    timeout-minutes: 15

    steps:
      - name: Clone repository
@@ -27,6 +27,7 @@ on:
 jobs:
  lint:
    runs-on: ubuntu-latest
+    timeout-minutes: 15

    steps:
      - name: Clone repository
@@ -25,6 +25,7 @@ on:
 jobs:
  lint:
    runs-on: ubuntu-latest
+    timeout-minutes: 15

    env:
      BUNDLE_ONLY: development
@@ -33,6 +33,7 @@ on:
 jobs:
  lint:
    runs-on: ubuntu-latest
+    timeout-minutes: 15

    steps:
      - name: Clone repository
@@ -27,6 +27,7 @@ on:
 jobs:
  lint:
    runs-on: ubuntu-latest
+    timeout-minutes: 15

    env:
      BUNDLE_ONLY: development
@@ -31,6 +31,7 @@ on:
 jobs:
  test:
    runs-on: ubuntu-latest
+    timeout-minutes: 15

    steps:
      - name: Clone repository
@@ -25,6 +25,7 @@ on:
 jobs:
  test:
    runs-on: ubuntu-latest
+    timeout-minutes: 15

    strategy:
      fail-fast: false
@@ -19,6 +19,7 @@ concurrency:
 jobs:
  build:
    runs-on: ubuntu-latest
+    timeout-minutes: 15

    strategy:
      fail-fast: true
@@ -75,6 +76,7 @@ jobs:

  test:
    runs-on: ubuntu-latest
+    timeout-minutes: 30

    needs:
      - build
@@ -176,6 +178,7 @@ jobs:
  test-e2e:
    name: End to End testing
    runs-on: ubuntu-latest
+    timeout-minutes: 15

    needs:
      - build
@@ -279,6 +282,7 @@ jobs:
  test-search:
    name: Elastic Search integration testing
    runs-on: ubuntu-latest
+    timeout-minutes: 15

    needs:
      - build