From 181822619bd7243a827aa92b1c8595911bafb9d5 Mon Sep 17 00:00:00 2001 From: Jialei Date: Mon, 25 Dec 2023 16:52:12 +0800 Subject: [PATCH] fix(console): prevent dirty git workspace after yarn install (#3096) --- .github/file-filter.yml | 3 ++- .github/workflows/{client.yaml => client.yml} | 0 .github/workflows/console.yml | 3 +++ .github/workflows/{helm-charts.yaml => helm-charts.yml} | 0 console/yarn.lock | 9 +-------- 5 files changed, 6 insertions(+), 9 deletions(-) rename .github/workflows/{client.yaml => client.yml} (100%) rename .github/workflows/{helm-charts.yaml => helm-charts.yml} (100%) diff --git a/.github/file-filter.yml b/.github/file-filter.yml index ef7cca8abc..3e2a0f73ad 100644 --- a/.github/file-filter.yml +++ b/.github/file-filter.yml @@ -1,10 +1,11 @@ client: - "**/*.py" - "client/**" - - ".github/workflows/client.yaml" + - ".github/workflows/client.yml" console: - "console/**" + - ".github/workflows/console.yml" docker: - "docker/**" diff --git a/.github/workflows/client.yaml b/.github/workflows/client.yml similarity index 100% rename from .github/workflows/client.yaml rename to .github/workflows/client.yml diff --git a/.github/workflows/console.yml b/.github/workflows/console.yml index 1b9df69bac..f5849d12d9 100644 --- a/.github/workflows/console.yml +++ b/.github/workflows/console.yml @@ -77,6 +77,9 @@ jobs: if: steps.yarn-cache.outputs.cache-hit != 'true' # Over here! run: make install-dependencies + - name: Check if git workspace dirty + run: git diff --exit-code --quiet + - name: Yarn lint working-directory: ./console run: make ci-lint diff --git a/.github/workflows/helm-charts.yaml b/.github/workflows/helm-charts.yml similarity index 100% rename from .github/workflows/helm-charts.yaml rename to .github/workflows/helm-charts.yml diff --git a/console/yarn.lock b/console/yarn.lock index 84352362ad..f474465d7c 100644 --- a/console/yarn.lock +++ b/console/yarn.lock @@ -10982,20 +10982,13 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -ejs@3.1.7, ejs@^3.1.7: +ejs@3.1.7, ejs@^3.1.7, ejs@^3.1.9: version "3.1.7" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.7.tgz#c544d9c7f715783dd92f0bddcf73a59e6962d006" integrity sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw== dependencies: jake "^10.8.5" -ejs@^3.1.9: - version "3.1.9" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" - integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ== - dependencies: - jake "^10.8.5" - electron-to-chromium@^1.4.431: version "1.4.469" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.469.tgz#c9cea85ab94031e239ca4ab03158726672d6f960"