Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fix detecting changes for spotless (#3174)

Koen85a91091a341
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ef2a2e639..d7d200eed 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,8 +3,8 @@ updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directories:
- - "/"
- - "/.github/actions/*/"
+ - "/"
+ - "/.github/actions/*/"
schedule:
interval: "daily"
ignore:
diff --git a/.github/workflows/custom-review.yml b/.github/workflows/custom-review.yml
index 928f6aa19..1e14d9997 100644
--- a/.github/workflows/custom-review.yml
+++ b/.github/workflows/custom-review.yml
@@ -17,7 +17,9 @@ jobs:
outputs: # See https://github.com/tj-actions/changed-files/tree/2bb135777322059ee3a3c9239999b159ff49febc#outputs-
any_modified: ${{ steps.changed-files.outputs.backend_any_modified == 'true' || steps.changed-files.outputs.ui_any_modified == 'true' }}
backend_any_modified: ${{ steps.changed-files.outputs.backend_any_modified }}
+ backend_spotless_any_modified: ${{ steps.changed-files.outputs.backend_spotless_any_modified }}
ui_any_modified: ${{ steps.changed-files.outputs.ui_any_modified }}
+ ui_spotless_any_modified: ${{ steps.changed-files.outputs.ui_spotless_any_modified }}
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
@@ -38,6 +40,21 @@ jobs:
- '!**/*.md'
- '!**/*.yml'
- '!yarn.lock'
+ # Sources and configuration that spotlessBackendCheck reads
+ backend_spotless:
+ - '**/*.{gradle,groovy,java,md,tpl,xml,xsd,yaml,yml}'
+ - '!ui/**'
+ - 'package.json'
+ - 'tools/spotless/**'
+ - 'ui/.prettierignore'
+ - 'ui/.prettierrc.json'
+ # Sources and configuration that spotlessUiCheck reads
+ ui_spotless:
+ - '*.{gradle,md}'
+ - 'package.json'
+ - 'tools/spotless/**'
+ - 'ui/**/*.{cjs,css,cts,gradle,html,js,json,jsonc,jsx,md,mdx,mjs,mts,ts,tsx}'
+ - 'ui/.prettierignore'
check-spotless:
name: Lint
@@ -45,7 +62,7 @@ jobs:
if: ${{ !failure() && !cancelled() }}
uses: "./.github/workflows/check-spotless.yml"
with:
- skip: ${{ needs.detect-changes.outputs.backend_any_modified != 'true' }}
+ skip: ${{ needs.detect-changes.outputs.backend_spotless_any_modified != 'true' }}
ui-check-spotless:
name: Lint
@@ -53,7 +70,7 @@ jobs:
if: ${{ !failure() && !cancelled() }}
uses: "./.github/workflows/ui-check-spotless.yml"
with:
- skip: ${{ needs.detect-changes.outputs.ui_any_modified != 'true' }}
+ skip: ${{ needs.detect-changes.outputs.ui_spotless_any_modified != 'true' }}
install-dist:
name: Build
diff --git a/.github/workflows/custom-staging.yml b/.github/workflows/custom-staging.yml
index f9ba9e8cf..cc9b139a6 100644
--- a/.github/workflows/custom-staging.yml
+++ b/.github/workflows/custom-staging.yml
@@ -17,7 +17,9 @@ jobs:
outputs: # See https://github.com/tj-actions/changed-files/tree/2bb135777322059ee3a3c9239999b159ff49febc#outputs-
any_modified: ${{ steps.changed-files.outputs.backend_any_modified == 'true' || steps.changed-files.outputs.ui_any_modified == 'true' }}
backend_any_modified: ${{ steps.changed-files.outputs.backend_any_modified }}
+ backend_spotless_any_modified: ${{ steps.changed-files.outputs.backend_spotless_any_modified }}
ui_any_modified: ${{ steps.changed-files.outputs.ui_any_modified }}
+ ui_spotless_any_modified: ${{ steps.changed-files.outputs.ui_spotless_any_modified }}
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
@@ -38,6 +40,21 @@ jobs:
- '!**/*.md'
- '!**/*.yml'
- '!yarn.lock'
+ # Sources and configuration that spotlessBackendCheck reads
+ backend_spotless:
+ - '**/*.{gradle,groovy,java,md,tpl,xml,xsd,yaml,yml}'
+ - '!ui/**'
+ - 'package.json'
+ - 'tools/spotless/**'
+ - 'ui/.prettierignore'
+ - 'ui/.prettierrc.json'
+ # Sources and configuration that spotlessUiCheck reads
+ ui_spotless:
+ - '*.{gradle,md}'
+ - 'package.json'
+ - 'tools/spotless/**'
+ - 'ui/**/*.{cjs,css,cts,gradle,html,js,json,jsonc,jsx,md,mdx,mjs,mts,ts,tsx}'
+ - 'ui/.prettierignore'
check-spotless:
name: Lint
@@ -45,7 +62,7 @@ jobs:
if: ${{ !failure() && !cancelled() }}
uses: "./.github/workflows/check-spotless.yml"
with:
- skip: ${{ needs.detect-changes.outputs.backend_any_modified != 'true' }}
+ skip: ${{ needs.detect-changes.outputs.backend_spotless_any_modified != 'true' }}
ui-check-spotless:
name: Lint
@@ -53,7 +70,7 @@ jobs:
if: ${{ !failure() && !cancelled() }}
uses: "./.github/workflows/ui-check-spotless.yml"
with:
- skip: ${{ needs.detect-changes.outputs.ui_any_modified != 'true' }}
+ skip: ${{ needs.detect-changes.outputs.ui_spotless_any_modified != 'true' }}
install-dist:
name: Build
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
index f7b76fccd..b157fa91c 100644
--- a/.github/workflows/review.yml
+++ b/.github/workflows/review.yml
@@ -18,7 +18,9 @@ jobs:
outputs: # See https://github.com/tj-actions/changed-files/tree/2bb135777322059ee3a3c9239999b159ff49febc#outputs-
any_modified: ${{ steps.changed-files.outputs.backend_any_modified == 'true' || steps.changed-files.outputs.ui_any_modified == 'true' }}
backend_any_modified: ${{ steps.changed-files.outputs.backend_any_modified }}
+ backend_spotless_any_modified: ${{ steps.changed-files.outputs.backend_spotless_any_modified }}
ui_any_modified: ${{ steps.changed-files.outputs.ui_any_modified }}
+ ui_spotless_any_modified: ${{ steps.changed-files.outputs.ui_spotless_any_modified }}
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
@@ -46,6 +48,21 @@ jobs:
- '!.yarnrc.yml'
- '!package.json'
- '!yarn.lock'
+ # Sources and configuration that spotlessBackendCheck reads
+ backend_spotless:
+ - '**/*.{gradle,groovy,java,md,tpl,xml,xsd,yaml,yml}'
+ - '!ui/**'
+ - 'package.json'
+ - 'tools/spotless/**'
+ - 'ui/.prettierignore'
+ - 'ui/.prettierrc.json'
+ # Sources and configuration that spotlessUiCheck reads
+ ui_spotless:
+ - '*.{gradle,md}'
+ - 'package.json'
+ - 'tools/spotless/**'
+ - 'ui/**/*.{cjs,css,cts,gradle,html,js,json,jsonc,jsx,md,mdx,mjs,mts,ts,tsx}'
+ - 'ui/.prettierignore'
check-spotless:
name: Lint
@@ -53,7 +70,7 @@ jobs:
if: ${{ !failure() && !cancelled() }}
uses: "./.github/workflows/check-spotless.yml"
with:
- skip: ${{ needs.detect-changes.outputs.backend_any_modified != 'true' }}
+ skip: ${{ needs.detect-changes.outputs.backend_spotless_any_modified != 'true' }}
ui-check-dependencies:
name: Lint
@@ -69,7 +86,7 @@ jobs:
if: ${{ !failure() && !cancelled() }}
uses: "./.github/workflows/ui-check-spotless.yml"
with:
- skip: ${{ needs.detect-changes.outputs.ui_any_modified != 'true' }}
+ skip: ${{ needs.detect-changes.outputs.ui_spotless_any_modified != 'true' }}
ui-check-outdated-translations:
name: Lint
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 578bd38c5..9bd7213a4 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -21,7 +21,9 @@ jobs:
# See https://github.com/tj-actions/changed-files/tree/2bb135777322059ee3a3c9239999b159ff49febc#outputs-
any_modified: ${{ steps.changed-files.outputs.backend_any_modified == 'true' || steps.changed-files.outputs.ui_any_modified == 'true' }}
backend_any_modified: ${{ steps.changed-files.outputs.backend_any_modified }}
+ backend_spotless_any_modified: ${{ steps.changed-files.outputs.backend_spotless_any_modified }}
ui_any_modified: ${{ steps.changed-files.outputs.ui_any_modified }}
+ ui_spotless_any_modified: ${{ steps.changed-files.outputs.ui_spotless_any_modified }}
# Version details
version: ${{ steps.get-version-details.outputs.version }}
version_with_qualifier: ${{ steps.get-version-details.outputs.version_with_qualifier }}
@@ -57,6 +59,21 @@ jobs:
- '!.yarnrc.yml'
- '!package.json'
- '!yarn.lock'
+ # Sources and configuration that spotlessBackendCheck reads
+ backend_spotless:
+ - '**/*.{gradle,groovy,java,md,tpl,xml,xsd,yaml,yml}'
+ - '!ui/**'
+ - 'package.json'
+ - 'tools/spotless/**'
+ - 'ui/.prettierignore'
+ - 'ui/.prettierrc.json'
+ # Sources and configuration that spotlessUiCheck reads
+ ui_spotless:
+ - '*.{gradle,md}'
+ - 'package.json'
+ - 'tools/spotless/**'
+ - 'ui/**/*.{cjs,css,cts,gradle,html,js,json,jsonc,jsx,md,mdx,mjs,mts,ts,tsx}'
+ - 'ui/.prettierignore'
- name: Get version details
id: get-version-details
@@ -81,7 +98,7 @@ jobs:
if: ${{ !failure() && !cancelled() }}
uses: "./.github/workflows/check-spotless.yml"
with:
- skip: ${{ needs.detect-changes.outputs.backend_any_modified != 'true' }}
+ skip: ${{ needs.detect-changes.outputs.backend_spotless_any_modified != 'true' }}
ui-check-dependencies:
name: Lint
@@ -97,7 +114,7 @@ jobs:
if: ${{ !failure() && !cancelled() }}
uses: "./.github/workflows/ui-check-spotless.yml"
with:
- skip: ${{ needs.detect-changes.outputs.ui_any_modified != 'true' }}
+ skip: ${{ needs.detect-changes.outputs.ui_spotless_any_modified != 'true' }}
ui-check-outdated-translations:
name: Lint