Skip to content
This repository has been archived by the owner on Feb 6, 2023. It is now read-only.

Commit

Permalink
DEV: Update CI workflows (#227)
Browse files Browse the repository at this point in the history
* DEV: Fix linting issues

Co-authored-by: Jarek Radosz <jradosz@gmail.com>
  • Loading branch information
discoursebot and CvX committed Nov 15, 2021
1 parent a05ee25 commit f68ede9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/plugin-linting.yml
Expand Up @@ -37,11 +37,10 @@ jobs:
shell: bash
run: |
yarn prettier -v
shopt -s extglob
if ls assets/**/*.@(scss|js|es6) &> /dev/null; then
if [ 0 -lt $(find assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
yarn prettier --list-different "assets/**/*.{scss,js,es6}"
fi
if ls test/**/*.@(js|es6) &> /dev/null; then
if [ 0 -lt $(find test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
yarn prettier --list-different "test/**/*.{js,es6}"
fi
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/plugin-tests.yml
Expand Up @@ -111,8 +111,7 @@ jobs:
id: check_spec
shell: bash
run: |
shopt -s extglob
if ls plugins/${{ github.event.repository.name }}/spec/**/*.@(rb) &> /dev/null; then
if [ 0 -lt $(find plugins/${{ github.event.repository.name }}/spec -type f -name "*.rb" 2> /dev/null | wc -l) ]; then
echo "::set-output name=files_exist::true"
fi
Expand All @@ -124,8 +123,7 @@ jobs:
id: check_qunit
shell: bash
run: |
shopt -s extglob
if ls plugins/${{ github.event.repository.name }}/test/javascripts/**/*.@(js|es6) &> /dev/null; then
if [ 0 -lt $(find plugins/${{ github.event.repository.name }}/test/javascripts -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
echo "::set-output name=files_exist::true"
fi
Expand Down
5 changes: 1 addition & 4 deletions assets/javascripts/discourse/widgets/chat-header-icon.js
Expand Up @@ -67,10 +67,7 @@ export default createWidget("header-chat-link", {
return window.open(getURL("/chat"), "_blank").focus();
}

if (
this.site.mobileView ||
this.chat.getSidebarActive()
) {
if (this.site.mobileView || this.chat.getSidebarActive()) {
DiscourseURL.routeTo("/chat");
} else {
this.appEvents.trigger("chat:toggle-open");
Expand Down
3 changes: 2 additions & 1 deletion assets/stylesheets/common/common.scss
Expand Up @@ -905,7 +905,8 @@ $float-height: 530px;
.chat-name {
color: var(--primary-high);
}
.topic-chat-name, .tag-chat-name {
.topic-chat-name,
.tag-chat-name {
margin: 0 0 0 0.25em;
}
.d-icon-lock {
Expand Down

0 comments on commit f68ede9

Please sign in to comment.