Merge pull request #735 from matrix-org/justinbot/fix-lint

Fix lint errors and run CI on all pull requests
matrix-org · Mar 3, 2023 · 00c735c · 00c735c
2 parents aa18240 + 46366cc
commit 00c735c
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches: [ develop ]
   pull_request:
-    branches: [ develop ]
 
 jobs:
   lint:
@@ -16,4 +15,4 @@ jobs:
       with:
         node-version: 16
     - run: yarn --ignore-scripts --pure-lockfile --strict-semver
-    - run: yarn lint
+    - run: yarn lint
diff --git a/.github/workflows/newsfile.yml b/.github/workflows/newsfile.yml
@@ -2,7 +2,6 @@ name: Newsfile
 
 on:
   pull_request:
-    branches: [ develop ]
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches: [ develop ]
   pull_request:
-    branches: [ develop ]
 
 jobs:
   unit:
@@ -53,4 +52,4 @@ jobs:
           --env POSTGRES_PASSWORD=pass \
           --env POSTGRES_INITDB_ARGS="--lc-collate C --lc-ctype C --encoding UTF8" \
           postgres:11
-    - run: yarn test:postgres
+    - run: yarn test:postgres
diff --git a/changelog.d/734.misc b/changelog.d/734.misc
@@ -0,0 +1 @@
+Add a new UI widget for linking and unlinking channels from within a Matrix room.
diff --git a/changelog.d/735.misc b/changelog.d/735.misc
@@ -0,0 +1 @@
+Add a new UI widget for linking and unlinking channels from within a Matrix room.
diff --git a/widget/src/SlackApp.tsx b/widget/src/SlackApp.tsx
@@ -305,7 +305,7 @@ const Unlinked = ({
             />
         </>;
     } else if (error) {
-        content = <Alerts.Warning><Text.Caption>{ error }</Text.Caption></Alerts.Warning>
+        content = <Alerts.Warning><Text.Caption>{ error }</Text.Caption></Alerts.Warning>;
     } else {
         content = <Text.Caption className="text-grey-200">Loading...</Text.Caption>;
     }

diff --git a/widget/src/components/icons/Alert.tsx b/widget/src/components/icons/Alert.tsx
@@ -1,5 +1,5 @@
-import * as React from 'react'
-import { SVGProps } from 'react'
+import * as React from 'react';
+import { SVGProps } from 'react';
 
 export const Alert = (props: SVGProps<SVGSVGElement>) => (
     <svg

diff --git a/widget/src/index.tsx b/widget/src/index.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
-import ReactDOM from 'react-dom/client'
+import React from 'react';
+import ReactDOM from 'react-dom/client';
 
-import App from './App'
+import App from './App';
 import './styles/index.css';
 
 ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(