From b466ceeec66108f3327ca5bf4992503d10658f3b Mon Sep 17 00:00:00 2001 From: Diljit VJ Date: Mon, 5 Aug 2024 10:46:54 +0530 Subject: [PATCH 1/5] chore: Remove google fonts imported from googleapis --- app/client/src/index.css | 1 - 1 file changed, 1 deletion(-) diff --git a/app/client/src/index.css b/app/client/src/index.css index 31433c7583c3..9758abf54e07 100755 --- a/app/client/src/index.css +++ b/app/client/src/index.css @@ -5,7 +5,6 @@ @import "theme/defaultTheme.css"; @import "theme/wds.css"; @import "assets/fonts/custom/index.css"; -@import "assets/fonts/google/index.css"; :root { /* TODO: This needs to be fixed! This override is to maintain branding changes. */ From 58e5b2c97c64058334dca9c79db1749b3d09ca47 Mon Sep 17 00:00:00 2001 From: Diljit VJ Date: Mon, 5 Aug 2024 15:54:05 +0530 Subject: [PATCH 2/5] remove css file that imports google fonts --- app/client/src/assets/fonts/google/index.css | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 app/client/src/assets/fonts/google/index.css diff --git a/app/client/src/assets/fonts/google/index.css b/app/client/src/assets/fonts/google/index.css deleted file mode 100644 index ba5027b1cd23..000000000000 --- a/app/client/src/assets/fonts/google/index.css +++ /dev/null @@ -1,9 +0,0 @@ -@import url("https://fonts.googleapis.com/css2?family=Nunito+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap"); -@import url("https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap"); -@import url("https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;700&display=swap"); -@import url("https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap"); -@import url("https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap"); -@import url("https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap"); -@import url("https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap"); -@import url("https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap"); -@import url("https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap"); From f58830b2719f6a1799cc56097ec51eb3deebc001 Mon Sep 17 00:00:00 2001 From: Diljit VJ Date: Tue, 6 Aug 2024 19:04:36 +0530 Subject: [PATCH 3/5] Split the files into one per line --- .github/workflows/client-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml index d37853acca87..1cc46efda6f4 100644 --- a/.github/workflows/client-build.yml +++ b/.github/workflows/client-build.yml @@ -78,7 +78,8 @@ jobs: ALL_CHANGED_FILES: ${{ steps.changed-files-specific.outputs.all_changed_files }} run: | echo "One or more files in the server folder has changed." - echo "List all the files that have changed: $ALL_CHANGED_FILES" + echo "List all the files that have changed: " + echo "$ALL_CHANGED_FILES | xargs -n 1 echo" - name: Check compliance if: inputs.pr != 0 && steps.changed-files-specific.outputs.any_changed == 'true' From 1270c6503db998148e41f15cfdfca628abd65940 Mon Sep 17 00:00:00 2001 From: Diljit VJ Date: Tue, 6 Aug 2024 19:11:23 +0530 Subject: [PATCH 4/5] Save changes files list in file --- .github/workflows/client-build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml index 1cc46efda6f4..edfa9a7e4ffd 100644 --- a/.github/workflows/client-build.yml +++ b/.github/workflows/client-build.yml @@ -68,18 +68,19 @@ jobs: - name: Get changed files in the client folder id: changed-files-specific - uses: tj-actions/changed-files@v41 + uses: tj-actions/changed-files@v44 with: files: "app/client/**" + write_output_files: true - name: Run step if any file(s) in the client folder change if: steps.changed-files-specific.outputs.any_changed == 'true' env: ALL_CHANGED_FILES: ${{ steps.changed-files-specific.outputs.all_changed_files }} run: | - echo "One or more files in the server folder has changed." - echo "List all the files that have changed: " - echo "$ALL_CHANGED_FILES | xargs -n 1 echo" + echo "One or more files in the client folder has changed." + echo "List all the files that have changed:" + cat "${{ github.workspace }}/.github/outputs/all_changed_files.txt" - name: Check compliance if: inputs.pr != 0 && steps.changed-files-specific.outputs.any_changed == 'true' From 142bcc8507af247ced35a92473cc6fdab9868025 Mon Sep 17 00:00:00 2001 From: Diljit VJ Date: Tue, 6 Aug 2024 21:56:36 +0530 Subject: [PATCH 5/5] Revert ci changes --- .github/workflows/client-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml index 5b810be12314..e247382c9bcb 100644 --- a/.github/workflows/client-build.yml +++ b/.github/workflows/client-build.yml @@ -68,7 +68,7 @@ jobs: - name: Get changed files in the client folder id: changed-files-specific - uses: tj-actions/changed-files@v44 + uses: tj-actions/changed-files@v41 with: files: "app/client/**"