DEV: Update CI workflows (#39)
This commit is contained in:
parent
a309e6406d
commit
7b3c12ae15
|
@ -1,10 +1,8 @@
|
||||||
{
|
{
|
||||||
"extends": "eslint-config-discourse",
|
"extends": "eslint-config-discourse",
|
||||||
"ignorePatterns": [
|
"ignorePatterns": ["javascripts/vendor/*"],
|
||||||
"javascripts/vendor/*"
|
|
||||||
],
|
|
||||||
"globals": {
|
"globals": {
|
||||||
"settings": "readonly",
|
"settings": "readonly",
|
||||||
"themePrefix": "readonly"
|
"themePrefix": "readonly"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
|
@ -6,44 +6,31 @@ on:
|
||||||
- main
|
- main
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: plugin-tests-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container: discourse/discourse_test:slim-browsers
|
container: discourse/discourse_test:slim-browsers
|
||||||
timeout-minutes: 30
|
timeout-minutes: 15
|
||||||
|
|
||||||
env:
|
env:
|
||||||
DISCOURSE_HOSTNAME: www.example.com
|
DISCOURSE_HOSTNAME: www.example.com
|
||||||
RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072
|
RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072
|
||||||
RAILS_ENV: development
|
RAILS_ENV: development
|
||||||
QUNIT_RAILS_ENV: development
|
|
||||||
PGHOST: postgres
|
|
||||||
PGUSER: discourse
|
PGUSER: discourse
|
||||||
PGPASSWORD: discourse
|
PGPASSWORD: discourse
|
||||||
|
|
||||||
services:
|
|
||||||
postgres:
|
|
||||||
image: postgres:13
|
|
||||||
ports:
|
|
||||||
- 5432:5432
|
|
||||||
env:
|
|
||||||
POSTGRES_USER: discourse
|
|
||||||
POSTGRES_PASSWORD: discourse
|
|
||||||
options: >-
|
|
||||||
--mount type=tmpfs,destination=/var/lib/postgresql/data
|
|
||||||
--health-cmd pg_isready
|
|
||||||
--health-interval 10s
|
|
||||||
--health-timeout 5s
|
|
||||||
--health-retries 5
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
repository: discourse/discourse
|
repository: discourse/discourse
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
|
|
||||||
- name: Install component
|
- name: Install component
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
path: tmp/component
|
path: tmp/component
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
|
@ -64,58 +51,84 @@ jobs:
|
||||||
sudo -u postgres psql -c "CREATE ROLE $PGUSER LOGIN SUPERUSER PASSWORD '$PGPASSWORD';"
|
sudo -u postgres psql -c "CREATE ROLE $PGUSER LOGIN SUPERUSER PASSWORD '$PGPASSWORD';"
|
||||||
|
|
||||||
- name: Bundler cache
|
- name: Bundler cache
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v3
|
||||||
with:
|
with:
|
||||||
path: vendor/bundle
|
path: vendor/bundle
|
||||||
key: ${{ runner.os }}-2.7-gem-${{ hashFiles('**/Gemfile.lock') }}
|
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-2.7-gem-
|
${{ runner.os }}-gem-
|
||||||
|
|
||||||
- name: Setup gems
|
- name: Setup gems
|
||||||
run: |
|
run: |
|
||||||
|
gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,""); print $0 }' Gemfile.lock)
|
||||||
bundle config --local path vendor/bundle
|
bundle config --local path vendor/bundle
|
||||||
bundle config --local deployment true
|
bundle config --local deployment true
|
||||||
bundle config --local without development
|
bundle config --local without development
|
||||||
bundle install --jobs 4
|
bundle install --jobs 4
|
||||||
bundle clean
|
bundle clean
|
||||||
|
|
||||||
|
- name: Lint English locale
|
||||||
|
run: bundle exec ruby script/i18n_lint.rb "tmp/component/locales/en.yml"
|
||||||
|
|
||||||
- name: Get yarn cache directory
|
- name: Get yarn cache directory
|
||||||
id: yarn-cache-dir
|
id: yarn-cache-dir
|
||||||
run: echo "::set-output name=dir::$(yarn cache dir)"
|
run: echo "::set-output name=dir::$(yarn cache dir)"
|
||||||
|
|
||||||
- name: Yarn cache
|
- name: Yarn cache
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v3
|
||||||
id: yarn-cache
|
id: yarn-cache
|
||||||
with:
|
with:
|
||||||
path: ${{ steps.yarn-cache-dir.outputs.dir }}
|
path: ${{ steps.yarn-cache-dir.outputs.dir }}
|
||||||
key: ${{ runner.os }}-${{ matrix.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
|
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-${{ matrix.os }}-yarn-
|
${{ runner.os }}-yarn-
|
||||||
|
|
||||||
- name: Yarn install
|
- name: Yarn install
|
||||||
run: yarn install
|
run: yarn install
|
||||||
|
|
||||||
- name: Migrate database
|
- 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: |
|
run: |
|
||||||
bin/rake db:create
|
bin/rake db:create
|
||||||
bin/rake db:migrate
|
bin/rake db:migrate
|
||||||
|
|
||||||
- name: Check qunit existence
|
- 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: Check QUnit existence
|
||||||
id: check_qunit
|
id: check_qunit
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
shopt -s extglob
|
if [ 0 -lt $(find tmp/component/test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
|
||||||
if ls tmp/component/test/**/*.@(js|es6) &> /dev/null; then
|
|
||||||
echo "::set-output name=files_exist::true"
|
echo "::set-output name=files_exist::true"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Component QUnit
|
- name: Component QUnit
|
||||||
if: steps.check_qunit.outputs.files_exist == 'true'
|
if: steps.check_qunit.outputs.files_exist == 'true'
|
||||||
run: |
|
run: |
|
||||||
bundle exec rake themes:install -- '--{"${{ github.event.repository.name }}": "tmp/component"}'
|
THEME_NAME=$(ruby -e 'require "json"; puts JSON.parse(File.read("tmp/component/about.json"))["name"]')
|
||||||
UNICORN_TIMEOUT=120 bundle exec rake themes:qunit[name,${{ github.event.repository.name }}]
|
bundle exec rake themes:install -- "--{\"$THEME_NAME\": \"tmp/component\"}"
|
||||||
|
QUNIT_EMBER_CLI=1 UNICORN_TIMEOUT=120 bundle exec rake "themes:qunit[name,$THEME_NAME]"
|
||||||
timeout-minutes: 10
|
timeout-minutes: 10
|
||||||
|
|
||||||
- name: Lint English locale
|
|
||||||
if: ${{ always() }}
|
|
||||||
run: bundle exec ruby script/i18n_lint.rb "tmp/component/locales/en.yml"
|
|
|
@ -1,43 +0,0 @@
|
||||||
name: Linting
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Set up Node.js
|
|
||||||
uses: actions/setup-node@v1
|
|
||||||
with:
|
|
||||||
node-version: 12
|
|
||||||
|
|
||||||
- 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
|
|
||||||
shopt -s extglob
|
|
||||||
if ls @(javascripts|desktop|mobile|common|scss)/**/*.@(scss|js|es6) &> /dev/null; then
|
|
||||||
yarn prettier --list-different "@(javascripts|desktop|mobile|common|scss)/**/*.{scss,js,es6}"
|
|
||||||
fi
|
|
||||||
if ls test/**/*.@(js|es6) &> /dev/null; then
|
|
||||||
yarn prettier --list-different "test/**/*.{js,es6}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Ember template lint
|
|
||||||
if: ${{ always() }}
|
|
||||||
run: yarn ember-template-lint javascripts
|
|
|
@ -1,3 +1,2 @@
|
||||||
.discourse-site
|
|
||||||
.DS_Store
|
|
||||||
node_modules
|
node_modules
|
||||||
|
.discourse-site
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
{}
|
|
@ -1,4 +1,5 @@
|
||||||
# DiscoTOC
|
# DiscoTOC
|
||||||
A Discourse theme component that generates a table of contents for topics with one click
|
|
||||||
|
A Discourse theme component that generates a table of contents for topics with one click
|
||||||
|
|
||||||
https://meta.discourse.org/t/discotoc-automatic-table-of-contents/111143
|
https://meta.discourse.org/t/discotoc-automatic-table-of-contents/111143
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "DiscoTOC",
|
"name": "DiscoTOC",
|
||||||
"about_url": "https://meta.discourse.org/t/discotoc-automatic-table-of-contents/111143",
|
|
||||||
"component": true,
|
"component": true,
|
||||||
|
"about_url": "https://meta.discourse.org/t/discotoc-automatic-table-of-contents/111143",
|
||||||
"license_url": "https://github.com/discourse/DiscoTOC/blob/main/LICENSE",
|
"license_url": "https://github.com/discourse/DiscoTOC/blob/main/LICENSE",
|
||||||
"assets": {
|
"assets": {
|
||||||
"icons-sprite": "/assets/sprite.svg"
|
"icons-sprite": "/assets/sprite.svg"
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
{{!-- Docs TOC placeholder --}}
|
{{! Docs TOC placeholder }}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
{{!-- TOC placeholder --}}
|
{{! TOC placeholder }}
|
||||||
|
|
|
@ -5,6 +5,6 @@
|
||||||
"author": "Discourse",
|
"author": "Discourse",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"eslint-config-discourse": "^1.1.9"
|
"eslint-config-discourse": "^3.2.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,8 +46,7 @@ acceptance("DiscoTOC", function (needs) {
|
||||||
can_wiki: true,
|
can_wiki: true,
|
||||||
link_counts: [
|
link_counts: [
|
||||||
{
|
{
|
||||||
url:
|
url: "http://127.0.0.1:4200/t/modernizing-the-antiquated-boxing-scoring-system/71/2",
|
||||||
"http://127.0.0.1:4200/t/modernizing-the-antiquated-boxing-scoring-system/71/2",
|
|
||||||
internal: true,
|
internal: true,
|
||||||
reflection: false,
|
reflection: false,
|
||||||
title: "Modernizing the antiquated boxing scoring system",
|
title: "Modernizing the antiquated boxing scoring system",
|
||||||
|
|
Loading…
Reference in New Issue