Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions .github/workflows/discourse-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ jobs:
- name: ESLint
if: ${{ !cancelled() && steps.js-pkg-manager.outputs.manager != env.JS_PKG_MANAGER_NULL_VALUE }}
run: |
if test -f eslint.config.mjs; then
if grep -q 'lint:js' package.json; then
${{ steps.js-pkg-manager.outputs.manager }} lint:js
elif test -f eslint.config.mjs; then
# modern flat config. No --ext needed
${{ steps.js-pkg-manager.outputs.manager }} eslint --no-error-on-unmatched-pattern {test,assets,admin/assets}/javascripts
else
Expand All @@ -88,27 +90,39 @@ jobs:
- name: Stylelint
if: ${{ !cancelled() && steps.js-pkg-manager.outputs.manager != env.JS_PKG_MANAGER_NULL_VALUE }}
run: |
if test -f stylelint.config.mjs; then
if grep -q 'lint:css' package.json; then
${{ steps.js-pkg-manager.outputs.manager }} lint:css
elif test -f stylelint.config.mjs; then
pnpm stylelint --allow-empty-input "assets/**/*.scss"
fi

- name: Prettier
if: ${{ !cancelled() && steps.js-pkg-manager.outputs.manager != env.JS_PKG_MANAGER_NULL_VALUE }}
run: |
${{ steps.js-pkg-manager.outputs.manager }} prettier --version
if [ -n "$(find assets -type f \( -name '*.scss' -or -name '*.js' -or -name '*.gjs' -or -name '*.hbs' \) 2>/dev/null)" ]; then
${{ steps.js-pkg-manager.outputs.manager }} prettier --check "assets/**/*.{scss,js,gjs,hbs}"
fi
if [ -n "$(find admin/assets -type f \( -name '*.scss' -or -name '*.js' -or -name '*.gjs' -or -name '*.hbs' \) 2>/dev/null)" ]; then
${{ steps.js-pkg-manager.outputs.manager }} prettier --check "admin/assets/**/*.{scss,js,gjs,hbs}"
fi
if [ 0 -lt "$(find test -type f \( -name '*.js' -or -name '*.gjs' \) 2> /dev/null | wc -l)" ]; then
${{ steps.js-pkg-manager.outputs.manager }} prettier --check "test/**/*.{js,gjs}"

if grep -q 'lint:prettier' package.json; then
${{ steps.js-pkg-manager.outputs.manager }} lint:prettier
else
if [ -n "$(find assets -type f \( -name '*.scss' -or -name '*.js' -or -name '*.gjs' -or -name '*.hbs' \) 2>/dev/null)" ]; then
${{ steps.js-pkg-manager.outputs.manager }} prettier --check "assets/**/*.{scss,js,gjs,hbs}"
fi
if [ -n "$(find admin/assets -type f \( -name '*.scss' -or -name '*.js' -or -name '*.gjs' -or -name '*.hbs' \) 2>/dev/null)" ]; then
${{ steps.js-pkg-manager.outputs.manager }} prettier --check "admin/assets/**/*.{scss,js,gjs,hbs}"
fi
if [ 0 -lt "$(find test -type f \( -name '*.js' -or -name '*.gjs' \) 2> /dev/null | wc -l)" ]; then
${{ steps.js-pkg-manager.outputs.manager }} prettier --check "test/**/*.{js,gjs}"
fi
fi

- name: Ember template lint
if: ${{ !cancelled() && steps.js-pkg-manager.outputs.manager != env.JS_PKG_MANAGER_NULL_VALUE }}
run: ${{ steps.js-pkg-manager.outputs.manager }} ember-template-lint --no-error-on-unmatched-pattern assets/javascripts admin/assets/javascripts
run: |
if grep -q 'lint:hbs' package.json; then
${{ steps.js-pkg-manager.outputs.manager }} lint:hbs
else
${{ steps.js-pkg-manager.outputs.manager }} ember-template-lint --no-error-on-unmatched-pattern assets/javascripts admin/assets/javascripts
fi

- name: Types
if: ${{ !cancelled() && steps.js-pkg-manager.outputs.manager != env.JS_PKG_MANAGER_NULL_VALUE }}
Expand Down
32 changes: 23 additions & 9 deletions .github/workflows/discourse-theme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ jobs:
- name: ESLint
if: ${{ !cancelled() && steps.js-pkg-manager.outputs.manager != env.JS_PKG_MANAGER_NULL_VALUE }}
run: |
if test -f eslint.config.mjs; then
if grep -q 'lint:js' package.json; then
${{ steps.js-pkg-manager.outputs.manager }} lint:js
elif test -f eslint.config.mjs; then
# modern flat config. No --ext needed
${{ steps.js-pkg-manager.outputs.manager }} eslint --no-error-on-unmatched-pattern {test,javascripts}
else
Expand All @@ -85,25 +87,37 @@ jobs:
- name: Stylelint
if: ${{ !cancelled() && steps.js-pkg-manager.outputs.manager != env.JS_PKG_MANAGER_NULL_VALUE }}
run: |
if test -f stylelint.config.mjs; then
if grep -q 'lint:css' package.json; then
${{ steps.js-pkg-manager.outputs.manager }} lint:css
elif test -f stylelint.config.mjs; then
pnpm stylelint --allow-empty-input "{javascripts,desktop,mobile,common,scss}/**/*.scss"
fi

- name: Prettier
if: ${{ !cancelled() && steps.js-pkg-manager.outputs.manager != env.JS_PKG_MANAGER_NULL_VALUE }}
run: |
${{ steps.js-pkg-manager.outputs.manager }} prettier --version
files=$(find javascripts desktop mobile common scss -type f \( -name "*.scss" -or -name "*.js" -or -name "*.gjs" -or -name "*.hbs" \) 2> /dev/null) || true
if [ -n "$files" ]; then
${{ steps.js-pkg-manager.outputs.manager }} prettier --check $files
fi
if [ 0 -lt "$(find test -type f \( -name '*.js' -or -name '*.gjs' \) 2> /dev/null | wc -l)" ]; then
${{ steps.js-pkg-manager.outputs.manager }} prettier --check "test/**/*.{js,gjs}"

if grep -q 'lint:prettier' package.json; then
${{ steps.js-pkg-manager.outputs.manager }} lint:prettier
else
files=$(find javascripts desktop mobile common scss -type f \( -name "*.scss" -or -name "*.js" -or -name "*.gjs" -or -name "*.hbs" \) 2> /dev/null) || true
if [ -n "$files" ]; then
${{ steps.js-pkg-manager.outputs.manager }} prettier --check $files
fi
if [ 0 -lt "$(find test -type f \( -name '*.js' -or -name '*.gjs' \) 2> /dev/null | wc -l)" ]; then
${{ steps.js-pkg-manager.outputs.manager }} prettier --check "test/**/*.{js,gjs}"
fi
fi

- name: Ember template lint
if: ${{ !cancelled() && steps.js-pkg-manager.outputs.manager != env.JS_PKG_MANAGER_NULL_VALUE }}
run: ${{ steps.js-pkg-manager.outputs.manager }} ember-template-lint --no-error-on-unmatched-pattern javascripts
run: |
if grep -q 'lint:hbs' package.json; then
${{ steps.js-pkg-manager.outputs.manager }} lint:hbs
else
${{ steps.js-pkg-manager.outputs.manager }} ember-template-lint --no-error-on-unmatched-pattern javascripts
fi

- name: Types
if: ${{ !cancelled() && steps.js-pkg-manager.outputs.manager != env.JS_PKG_MANAGER_NULL_VALUE }}
Expand Down
Loading