DEV: Add CI setup and fix linting issues (#10)

This commit is contained in:
Jarek Radosz 2022-06-18 16:51:57 +02:00 committed by GitHub
parent e378f4dcc7
commit 13dfb4365a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 2171 additions and 13 deletions

8
.eslintrc Normal file
View File

@ -0,0 +1,8 @@
{
"extends": "eslint-config-discourse",
"ignorePatterns": ["javascripts/vendor/*"],
"globals": {
"settings": "readonly",
"themePrefix": "readonly"
}
}

48
.github/workflows/component-linting.yml vendored Normal file
View File

@ -0,0 +1,48 @@
name: Linting
on:
push:
branches:
- main
pull_request:
concurrency:
group: plugin-linting-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
cancel-in-progress: true
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 16
cache: yarn
- name: Yarn install
run: yarn install
- name: ESLint
if: ${{ always() }}
run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern {test,javascripts}
- name: Prettier
if: ${{ always() }}
shell: bash
run: |
yarn prettier -v
files=$(find javascripts desktop mobile common scss -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" \) 2> /dev/null) || true
if [ -n "$files" ]; then
yarn prettier --list-different $files
fi
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
- name: Ember template lint
if: ${{ always() }}
run: yarn ember-template-lint --no-error-on-unmatched-pattern javascripts

147
.github/workflows/component-tests.yml vendored Normal file
View File

@ -0,0 +1,147 @@
name: Tests
on:
push:
branches:
- main
pull_request:
concurrency:
group: plugin-tests-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
cancel-in-progress: true
jobs:
check:
runs-on: ubuntu-latest
outputs:
tests_exist: ${{ steps.check_tests.outputs.tests_exist }}
steps:
- name: Install component
uses: actions/checkout@v3
with:
path: tmp/component
fetch-depth: 1
- name: Check QUnit existence
id: check_tests
shell: bash
run: |
if [ 0 -lt $(find tmp/component/test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
echo "::set-output name=tests_exist::true"
fi
test:
needs: check
if: ${{ needs.check.outputs.tests_exist }}
runs-on: ubuntu-latest
container: discourse/discourse_test:slim-browsers
timeout-minutes: 15
env:
DISCOURSE_HOSTNAME: www.example.com
RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072
RAILS_ENV: development
PGUSER: discourse
PGPASSWORD: discourse
steps:
- uses: actions/checkout@v3
with:
repository: discourse/discourse
fetch-depth: 1
- name: Install component
uses: actions/checkout@v3
with:
path: tmp/component
fetch-depth: 1
- name: Setup Git
run: |
git config --global user.email "ci@ci.invalid"
git config --global user.name "Discourse CI"
- name: Start redis
run: |
redis-server /etc/redis/redis.conf &
- name: Start Postgres
run: |
chown -R postgres /var/run/postgresql
sudo -E -u postgres script/start_test_db.rb
sudo -u postgres psql -c "CREATE ROLE $PGUSER LOGIN SUPERUSER PASSWORD '$PGPASSWORD';"
- name: Bundler cache
uses: actions/cache@v3
with:
path: vendor/bundle
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-gem-
- name: Setup gems
run: |
gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,""); print $0 }' Gemfile.lock)
bundle config --local path vendor/bundle
bundle config --local deployment true
bundle config --local without development
bundle install --jobs 4
bundle clean
- name: Lint English locale
run: bundle exec ruby script/i18n_lint.rb "tmp/component/locales/en.yml"
- name: Get yarn cache directory
id: yarn-cache-dir
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Yarn cache
uses: actions/cache@v3
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Yarn install
run: yarn install
- name: Fetch app state cache
uses: actions/cache@v3
id: app-cache
with:
path: tmp/app-cache
key: >-
${{ hashFiles('.github/workflows/tests.yml') }}-
${{ hashFiles('db/**/*', 'plugins/**/db/**/*') }}-
- name: Restore database from cache
if: steps.app-cache.outputs.cache-hit == 'true'
run: psql -f tmp/app-cache/cache.sql postgres
- name: Restore uploads from cache
if: steps.app-cache.outputs.cache-hit == 'true'
run: rm -rf public/uploads && cp -r tmp/app-cache/uploads public/uploads
- name: Create and migrate database
if: steps.app-cache.outputs.cache-hit != 'true'
run: |
bin/rake db:create
bin/rake db:migrate
- name: Dump database for cache
if: steps.app-cache.outputs.cache-hit != 'true'
run: mkdir -p tmp/app-cache && pg_dumpall > tmp/app-cache/cache.sql
- name: Dump uploads for cache
if: steps.app-cache.outputs.cache-hit != 'true'
run: rm -rf tmp/app-cache/uploads && cp -r public/uploads tmp/app-cache/uploads
- name: Component QUnit
run: |
THEME_NAME=$(ruby -e 'require "json"; puts JSON.parse(File.read("tmp/component/about.json"))["name"]')
bundle exec rake themes:install -- "--{\"$THEME_NAME\": \"tmp/component\"}"
UNICORN_TIMEOUT=120 bundle exec rake "themes:qunit[name,$THEME_NAME]"
timeout-minutes: 10

3
.gitignore vendored
View File

@ -1 +1,2 @@
.discourse-site node_modules
.discourse-site

1
.prettierrc Normal file
View File

@ -0,0 +1 @@
{}

4
.template-lintrc.js Normal file
View File

@ -0,0 +1,4 @@
module.exports = {
plugins: ["ember-template-lint-plugin-discourse"],
extends: "discourse:recommended",
};

View File

@ -1,3 +1,3 @@
# discourse-category-icons # discourse-category-icons
See https://meta.discourse.org/t/category-icons-component/104683 for more details. See https://meta.discourse.org/t/category-icons-component/104683 for more details.

View File

@ -1,6 +1,6 @@
{ {
"name": "Category Icons", "name": "Category Icons",
"component": true,
"about_url": "https://github.com/discourse/discourse-category-icons", "about_url": "https://github.com/discourse/discourse-category-icons",
"license_url": "https://github.com/discourse/discourse-category-icons/blob/main/LICENSE", "license_url": "https://github.com/discourse/discourse-category-icons/blob/main/LICENSE"
"component": true
} }

View File

@ -1 +1 @@
{{mount-widget widget="category-icon" args=(hash category=category)}} {{mount-widget widget="category-icon" args=(hash category=category)}}

View File

@ -21,24 +21,26 @@ export default {
let lockIcon = settings.category_lock_icon || "lock"; let lockIcon = settings.category_lock_icon || "lock";
categoryTitleLink.reopen({ categoryTitleLink.reopen({
lockIcon: lockIcon, lockIcon,
}); });
categoriesBoxes.reopen({ categoriesBoxes.reopen({
lockIcon: lockIcon, lockIcon,
}); });
categoriesBoxesWithTopics.reopen({ categoriesBoxesWithTopics.reopen({
lockIcon: lockIcon, lockIcon,
}); });
function categoryStripe(color, classes) { function categoryStripe(color, classes) {
var style = color ? "style='background-color: #" + color + ";'" : ""; let style = color ? "style='background-color: #" + color + ";'" : "";
return "<span class='" + classes + "' " + style + "></span>"; return "<span class='" + classes + "' " + style + "></span>";
} }
function getIconItem(categorySlug) { function getIconItem(categorySlug) {
if (!categorySlug) return; if (!categorySlug) {
return;
}
let categoryThemeItem = categoryThemeList.find((str) => let categoryThemeItem = categoryThemeList.find((str) =>
str.indexOf(",") > -1 str.indexOf(",") > -1
@ -48,7 +50,7 @@ export default {
if (categoryThemeItem) { if (categoryThemeItem) {
let iconItem = categoryThemeItem.split(","); let iconItem = categoryThemeItem.split(",");
// Test partial/exact match // Test partial/exact match
if (iconItem[3] == "partial") { if (iconItem[3] === "partial") {
return iconItem; return iconItem;
} else if (iconItem[0] === categorySlug) { } else if (iconItem[0] === categorySlug) {
return iconItem; return iconItem;
@ -122,7 +124,7 @@ export default {
? `style="color: #${color}"` ? `style="color: #${color}"`
: `style="color: ${iconItem[2]}"` : `style="color: ${iconItem[2]}"`
: ""; : "";
let itemIcon = iconItem[1] != "" ? iconHTML(iconItem[1]) : ""; let itemIcon = iconItem[1] !== "" ? iconHTML(iconItem[1]) : "";
html += `<span ${itemColor} class="category-badge-icon">${itemIcon}</span>`; html += `<span ${itemColor} class="category-badge-icon">${itemIcon}</span>`;
} }
/// End custom category icon /// End custom category icon
@ -169,7 +171,7 @@ export default {
? `color: #${attrs.category.color}` ? `color: #${attrs.category.color}`
: `color: ${iconItem[2]}` : `color: ${iconItem[2]}`
: ""; : "";
let itemIcon = iconItem[1] != "" ? iconNode(iconItem[1]) : ""; let itemIcon = iconItem[1] !== "" ? iconNode(iconItem[1]) : "";
return h("span.category-icon", { style: itemColor }, itemIcon); return h("span.category-icon", { style: itemColor }, itemIcon);
} }
}, },

10
package.json Normal file
View File

@ -0,0 +1,10 @@
{
"name": "discourse-category-icons",
"version": "1.0.0",
"repository": "https://github.com/discourse/discourse-category-icons",
"author": "Discourse",
"license": "MIT",
"devDependencies": {
"eslint-config-discourse": "^3.2.0"
}
}

1937
yarn.lock Normal file

File diff suppressed because it is too large Load Diff