Skip to content

Commit

Permalink
chore: Merge lint and release GH actions into one
Browse files Browse the repository at this point in the history
  • Loading branch information
szuperaz committed May 16, 2022
1 parent dc08b68 commit e6aa67d
Show file tree
Hide file tree
Showing 6 changed files with 4,892 additions and 4,928 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/stylelint.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
name: Release
name: Workflow

on:
push:
branches:
- main
pull_request:
branches:
- main
- develop
- theming2

jobs:
publish-release:
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"scripts": {
"build": "yarn build-v1 && yarn build-v2",
"build-v1": "rm -rf dist && mkdir -p dist && yarn bundle-sass && yarn copy-assets && yarn copy-styles",
"build-v2": "rm -rf dist-v2 && mkdir -p dist-v2 && yarn transform && yarn compile-to-css",
"build-v2": "rm -rf dist-v2 && mkdir -p dist-v2/scss && yarn transform && yarn compile-to-css",
"transform": "postcss --dir dist-v2/scss --base src-v2/styles src-v2/styles",
"compile-to-css": "sass dist-v2/scss/index.scss dist-v2/css/index.css --style compressed && sass dist-v2/scss/index.layout.scss dist-v2/css/index.layout.css --style compressed",
"bundle-sass": "echo '\u001b[34mℹ\u001b[0m Compiling scss files to css bundle' && sass src/styles/index.scss dist/css/index.css --style compressed && echo '\u001b[32m✓\u001b[0m Finished bundling css'",
"copy-assets": "echo '\u001b[34mℹ\u001b[0m Copying assets to distributed directory' && cp -R src/assets dist/assets && echo '\u001b[32m✓\u001b[0m Finished copying assets'",
"copy-styles": "echo '\u001b[34mℹ\u001b[0m Copying scss files to distributed directory' && cp -R src/styles dist/scss && cp -R src-v2/styles dist-v2/scss && echo '\u001b[32m✓\u001b[0m Finished copying styles'",
"copy-styles": "echo '\u001b[34mℹ\u001b[0m Copying scss files to distributed directory' && cp -R src/styles dist/scss && echo '\u001b[32m✓\u001b[0m Finished copying styles'",
"lint": "stylelint '**/*.scss' --max-warnings 0",
"build:ci": "yarn && yarn lint && yarn build",
"start": "yarn build && sass --watch src/styles/index.scss dist/css/index.css"
Expand Down
2 changes: 1 addition & 1 deletion src-v2/styles/ChannelPreview/ChannelPreview-layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
}
}

// PostCSS transformations get into an endless loop if these selecters are nested under .str-chat__channel-preview-loading
// PostCSS transformations get into an endless loop if these selectors are nested under .str-chat__channel-preview-loading
.str-chat__loading-channels-username {
height: calc(var(--str-chat__spacing-px) * 16);
width: calc(var(--str-chat__spacing-px) * 66);
Expand Down
1 change: 1 addition & 0 deletions src-v2/styles/ChannelPreview/ChannelPreview-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
}
}
}

.str-chat__channel-preview-loading {
animation: pulsate 1s linear 0s infinite alternate;

Expand Down
Loading

0 comments on commit e6aa67d

Please sign in to comment.