Merge branch 't3chguy/dedup-icons-generic' of github.com:element-hq/m…

…atrix-react-sdk into t3chguy/dedup-icons
element-hq · Oct 14, 2024 · 5660d50 · 5660d50
2 parents 6da8e43 + 498e8ba
commit 5660d50
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -10,7 +10,7 @@ on:
 jobs:
     backport:
         name: Backport
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         # Only react to merged PRs for security reasons.
         # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
         if: >

diff --git a/.github/workflows/end-to-end-tests-netlify.yaml b/.github/workflows/end-to-end-tests-netlify.yaml
@@ -15,7 +15,7 @@ jobs:
     report:
         if: github.event.workflow_run.conclusion != 'cancelled'
         name: Report results
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         environment: Netlify
         permissions:
             statuses: write

diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml
@@ -45,7 +45,7 @@ env:
 jobs:
     build:
         name: "Build Element-Web"
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         if: inputs.skip != true
         steps:
             - name: Checkout code
@@ -95,7 +95,7 @@ jobs:
         name: "Run Tests ${{ matrix.runner }}/${{ strategy.job-total }}"
         needs: build
         if: inputs.skip != true
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         permissions:
             actions: read
             issues: read
@@ -162,7 +162,7 @@ jobs:
         name: end-to-end-tests
         needs: playwright
         if: always()
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - uses: actions/checkout@v4
               if: inputs.skip != true

diff --git a/.github/workflows/netlify.yaml b/.github/workflows/netlify.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
     deploy:
         if: github.event.workflow_run.conclusion != 'cancelled' && github.event.workflow_run.event == 'pull_request'
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         environment: Netlify
         steps:
             - name: 📝 Create Deployment

diff --git a/.github/workflows/notify-element-web.yml b/.github/workflows/notify-element-web.yml
@@ -7,7 +7,7 @@ on:
 jobs:
     notify-element-web:
         name: "Notify Element Web"
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         # Only respect triggers from our develop branch, ignore that of forks
         if: github.repository == 'element-hq/matrix-react-sdk'
         steps:

diff --git a/.github/workflows/playwright-image-updates.yaml b/.github/workflows/playwright-image-updates.yaml
@@ -5,7 +5,7 @@ on:
         - cron: "0 6 * * *" # Every day at 6am UTC
 jobs:
     update:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - uses: actions/checkout@v4
 

diff --git a/.github/workflows/pull_request_base_branch.yaml b/.github/workflows/pull_request_base_branch.yaml
@@ -5,7 +5,7 @@ on:
 jobs:
     check_base_branch:
         name: Check PR base branch
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - uses: actions/github-script@v7
               with:

diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
@@ -18,7 +18,7 @@ env:
 jobs:
     ts_lint:
         name: "Typescript Syntax Check"
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - uses: actions/checkout@v4
 
@@ -67,7 +67,7 @@ jobs:
 
     rethemendex_lint:
         name: "Rethemendex Check"
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - uses: actions/checkout@v4
 
@@ -77,7 +77,7 @@ jobs:
 
     js_lint:
         name: "ESLint"
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - uses: actions/checkout@v4
 
@@ -95,7 +95,7 @@ jobs:
 
     style_lint:
         name: "Style Lint"
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - uses: actions/checkout@v4
 
@@ -113,7 +113,7 @@ jobs:
 
     workflow_lint:
         name: "Workflow Lint"
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - uses: actions/checkout@v4
 
@@ -131,7 +131,7 @@ jobs:
 
     analyse_dead_code:
         name: "Analyse Dead Code"
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - uses: actions/checkout@v4
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -29,7 +29,7 @@ env:
 jobs:
     jest:
         name: Jest
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         strategy:
             fail-fast: false
             matrix:
@@ -93,7 +93,7 @@ jobs:
         name: jest-tests
         needs: jest
         if: always()
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - if: needs.jest.result != 'skipped' && needs.jest.result != 'success'
               run: exit 1
@@ -111,7 +111,7 @@ jobs:
 
     app-tests:
         name: Element Web Integration Tests
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - uses: actions/checkout@v4
               with: