-
Notifications
You must be signed in to change notification settings - Fork 130
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
DEV: Add CI setup and fix linting issues (#18)
- Loading branch information
Showing
17 changed files
with
1,335 additions
and
803 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,8 @@ | ||
| { | ||
| "extends": "eslint-config-discourse" | ||
| "extends": "eslint-config-discourse", | ||
| "ignorePatterns": ["javascripts/vendor/*"], | ||
| "globals": { | ||
| "settings": "readonly", | ||
| "themePrefix": "readonly" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 "[email protected]" | ||
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| .discourse-site | ||
| node_modules | ||
| HELP | ||
| .discourse-site |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {} |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,41 @@ | ||
| { | ||
| "name": "Air Theme", | ||
| "about_url": null, | ||
| "license_url": null, | ||
| "assets": { | ||
| }, | ||
| "components": [ | ||
| "https://github.com/jordanvidrine/discourse-category-group-boxes.git", | ||
| "https://github.com/discourse/discourse-color-scheme-toggle.git", | ||
| "https://github.com/discourse/discourse-loading-slider.git", | ||
| "https://github.com/discourse/discourse-clickable-topic.git", | ||
| "https://github.com/discourse/discourse-search-banner.git" | ||
| ], | ||
| "modifiers": { | ||
| "serialize_topic_excerpts": true | ||
| }, | ||
| "name": "Air Theme", | ||
| "color_schemes": { | ||
| "air-light": { | ||
| "primary": "1c1c1c", | ||
| "secondary": "F9FCFF", | ||
| "secondary": "f9fcff", | ||
| "tertiary": "3877e5", | ||
| "quaternary": "7E8B93", | ||
| "header_background": "F9FCFF", | ||
| "quaternary": "7e8b93", | ||
| "header_background": "f9fcff", | ||
| "header_primary": "122b43", | ||
| "highlight": "E6CB37", | ||
| "danger": "D05454", | ||
| "success": "71BD9F", | ||
| "love": "C16AD7" | ||
| "highlight": "e6cb37", | ||
| "danger": "d05454", | ||
| "success": "71bd9f", | ||
| "love": "c16ad7" | ||
| }, | ||
| "air-dark": { | ||
| "primary": "E0E0E0", | ||
| "secondary": "2D2D2D", | ||
| "tertiary": "9A5CFD", | ||
| "primary": "e0e0e0", | ||
| "secondary": "2d2d2d", | ||
| "tertiary": "9a5cfd", | ||
| "quaternary": "71bd9f", | ||
| "header_background": "202020", | ||
| "header_primary": "E0E0E0", | ||
| "highlight": "9A5CFD", | ||
| "danger": "D05454", | ||
| "success": "71BD9F", | ||
| "love": "C16AD7" | ||
| "header_primary": "e0e0e0", | ||
| "highlight": "9a5cfd", | ||
| "danger": "d05454", | ||
| "success": "71bd9f", | ||
| "love": "c16ad7" | ||
| } | ||
| }, | ||
| "components": ["https://github.com/jordanvidrine/discourse-category-group-boxes.git","https://github.com/discourse/discourse-color-scheme-toggle.git","https://github.com/discourse/discourse-loading-slider.git","https://github.com/discourse/discourse-clickable-topic.git","https://github.com/discourse/discourse-search-banner.git"] | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| <div class="background-container"></div> | ||
| <div class="background-container"></div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| @import "showcased-categories"; | ||
| @import "chat-desktop"; | ||
| @import "chat-desktop"; |
16 changes: 8 additions & 8 deletions
16
javascripts/discourse/initializers/customize-edit-category-general.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,26 @@ | ||
| import { withPluginApi } from "discourse/lib/plugin-api"; | ||
| import { cancel, later } from "@ember/runloop"; | ||
| import { cancel } from "@ember/runloop"; | ||
|
|
||
| export default { | ||
| name: "customize-edit-category-general", | ||
|
|
||
| initialize() { | ||
| withPluginApi("0.8.14", api => { | ||
| withPluginApi("0.8.14", (api) => { | ||
| api.modifyClass("component:edit-category-general", { | ||
| pluginId: "discourse-air", | ||
|
|
||
| didInsertElement() { | ||
| this._super(...arguments); | ||
| document.body.classList.add("edit-category") | ||
| document.body.classList.add("edit-category"); | ||
| this._focusCategoryName(); | ||
| }, | ||
|
|
||
| willDestroyElement() { | ||
| this._super(...arguments); | ||
| document.body.classList.remove("edit-category") | ||
| document.body.classList.remove("edit-category"); | ||
| this._laterFocus && cancel(this._laterFocus); | ||
| }, | ||
| }) | ||
| }) | ||
| } | ||
| } | ||
| }); | ||
| }); | ||
| }, | ||
| }; |
Oops, something went wrong.