DEV: Update CI setup and fix linting issues (#20)

This commit is contained in:
Jarek Radosz 2022-06-18 01:34:02 +02:00 committed by GitHub
parent 8a2dad96b6
commit ac456a43b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 1427 additions and 885 deletions

View File

@ -1,6 +1,8 @@
{ {
"extends": "eslint-config-discourse", "extends": "eslint-config-discourse",
"ignorePatterns": ["javascripts/vendor/*"],
"globals": { "globals": {
"settings": true "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

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
node_modules node_modules
yarn-error.log .discourse-site

1
.prettierrc Normal file
View File

@ -0,0 +1 @@
{}

View File

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

View File

@ -4,5 +4,4 @@ A theme component to add category banners to your Discourse community.
More details here: https://meta.discourse.org/t/discourse-category-banners/86241 More details here: https://meta.discourse.org/t/discourse-category-banners/86241
![Category banner](https://discourse-meta.s3-us-west-1.amazonaws.com/original/3X/1/d/1d75ec58312e4a0b4d8b20b3272fca47f2b7247d.png) ![Category banner](https://discourse-meta.s3-us-west-1.amazonaws.com/original/3X/1/d/1d75ec58312e4a0b4d8b20b3272fca47f2b7247d.png)

View File

@ -1,6 +1,6 @@
{ {
"name": "discourse-category-banners", "name": "discourse-category-banners",
"about_url": "https://meta.discourse.org/t/discourse-category-banners/86241",
"component": true, "component": true,
"about_url": "https://meta.discourse.org/t/discourse-category-banners/86241",
"license_url": "https://meta.discourse.org/t/discourse-category-banners/86241" "license_url": "https://meta.discourse.org/t/discourse-category-banners/86241"
} }

View File

@ -44,15 +44,15 @@ export default createWidget("category-header-widget", {
route.params && route.params &&
route.params.hasOwnProperty("category_slug_path_with_id") route.params.hasOwnProperty("category_slug_path_with_id")
) { ) {
const categories = settings.categories const categories = {};
.split("|")
.reduce((categories, item) => { settings.categories.split("|").forEach((item) => {
item = item.split(":"); item = item.split(":");
if (item[0]) { if (item[0]) {
categories[item[0]] = item[1] || "all"; categories[item[0]] = item[1] || "all";
} }
return categories; });
}, {});
const category = Category.findBySlugPathWithID( const category = Category.findBySlugPathWithID(
route.params.category_slug_path_with_id route.params.category_slug_path_with_id
@ -88,8 +88,8 @@ export default createWidget("category-header-widget", {
`div.category-title-header.category-banner-${category.slug}`, `div.category-title-header.category-banner-${category.slug}`,
{ {
attributes: { attributes: {
style: `background-color: #${category.color}; color: #${category.text_color};` style: `background-color: #${category.color}; color: #${category.text_color};`,
} },
}, },
h("div.category-title-contents", buildCategory(category, this)) h("div.category-title-contents", buildCategory(category, this))
); );
@ -97,5 +97,5 @@ export default createWidget("category-header-widget", {
} else { } else {
document.body.classList.remove("category-header"); document.body.classList.remove("category-header");
} }
} },
}); });

View File

@ -1,7 +1,10 @@
{ {
"name": "discourse-category-banners",
"version": "1.0.0",
"repository": "https://github.com/discourse/discourse-category-banners",
"author": "Discourse", "author": "Discourse",
"license": "MIT", "license": "GPL-2.0-or-later",
"devDependencies": { "devDependencies": {
"eslint-config-discourse": "latest" "eslint-config-discourse": "^3.2.0"
} }
} }

2070
yarn.lock

File diff suppressed because it is too large Load Diff