From 107531386957b6869e1bf9788126a00a100a4e64 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Tue, 30 Jul 2024 11:25:24 +0100 Subject: [PATCH 1/3] ci(pie-monorepo): DSW-000 update turbo filter syntax --- .changeset/lovely-ducks-sneeze.md | 6 ++++++ .github/workflows/ci.yml | 14 +++++++------- turbo.json | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 .changeset/lovely-ducks-sneeze.md diff --git a/.changeset/lovely-ducks-sneeze.md b/.changeset/lovely-ducks-sneeze.md new file mode 100644 index 0000000000..1d66dbd6c7 --- /dev/null +++ b/.changeset/lovely-ducks-sneeze.md @@ -0,0 +1,6 @@ +--- +"pie-monorepo": minor +--- + +[Changed] - Update turbo filter syntax for GitHub Actions +[Changed] - Use the old UI for turbo console output diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a5a199254..ce517e8883 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,19 +75,19 @@ jobs: - name: Verify if pie-docs has changes id: docs-check run: | - DOCS_CHANGE=$(npx -y turbo run build --filter='{./apps/pie-docs}...[origin/main]' --dry=json | jq '.packages | length > 0') + DOCS_CHANGE=$(npx -y turbo run build --filter=./apps/pie-docs...[origin/main] --dry=json | jq '.packages | length > 0') echo "Change Detected: $DOCS_CHANGE" echo "docs-change=$DOCS_CHANGE" >> $GITHUB_OUTPUT - name: Verify if web components have changes id: component-check run: | - COMPONENT_CHANGE=$(npx -y turbo run build --filter='{./packages/components/*}...[origin/main]' --dry=json | jq '.packages | length > 0') + COMPONENT_CHANGE=$(npx -y turbo run build --filter=./packages/components/*...[origin/main] --dry=json | jq '.packages | length > 0') echo "Change Detected: $COMPONENT_CHANGE" echo "web-components-change=$COMPONENT_CHANGE" >> $GITHUB_OUTPUT - name: Verify if storybook has changes id: storybook-check run: | - STORYBOOK_CHANGE=$(npx -y turbo run build --filter='{./apps/pie-storybook}...[origin/main]' --dry=json | jq '.packages | length > 0') + STORYBOOK_CHANGE=$(npx -y turbo run build --filter=./apps/pie-storybook...[origin/main] --dry=json | jq '.packages | length > 0') echo "Change Detected: $STORYBOOK_CHANGE" echo "storybook-change=$STORYBOOK_CHANGE" >> $GITHUB_OUTPUT @@ -198,7 +198,7 @@ jobs: - name: Run All System / Component / a11y Tests uses: ./.github/actions/run-script with: - script-name: "test:browsers:ci --filter='./packages/components/*'" + script-name: "test:browsers:ci --filter=./packages/components/*" - uses: actions/upload-artifact@v3 if: always() with: @@ -210,13 +210,13 @@ jobs: uses: ./.github/actions/run-script if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' with: - script-name: "test:visual:ci --filter='{./packages/components/*}...[HEAD^1]'" + script-name: "test:visual:ci --filter=./packages/components/*...[HEAD^1]" concurrency: 1 - name: Run Changed Package Visual Tests uses: ./.github/actions/run-script if: (github.event_name == 'pull_request' && github.event.pull_request.draft == false) && github.ref != 'refs/heads/main' with: - script-name: "test:visual:ci --filter='{./packages/components/*}...[origin/main]'" + script-name: "test:visual:ci --filter=./packages/components/*...[origin/main]" concurrency: 1 - uses: actions/upload-artifact@v3 if: always() @@ -287,7 +287,7 @@ jobs: uses: ./.github/actions/run-script if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' with: - script-name: "test:visual:ci --filter='pie-docs...[HEAD^1]'" + script-name: "test:visual:ci --filter=pie-docs...[HEAD^1]" concurrency: 1 - name: Run Changed Package Visual Tests uses: ./.github/actions/run-script diff --git a/turbo.json b/turbo.json index 5be50e6ff4..792db070b1 100644 --- a/turbo.json +++ b/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turborepo.org/schema.json", - "ui": "tui", + "ui": "stream", "tasks": { "build": { "cache": true, From 652b3fb7b2f38d7a92b7f7fc76f28856a4ae7286 Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Tue, 30 Jul 2024 11:26:38 +0100 Subject: [PATCH 2/3] Test changes --- apps/pie-docs/src/404.njk | 2 ++ packages/components/pie-modal/src/modal.scss | 2 ++ 2 files changed, 4 insertions(+) diff --git a/apps/pie-docs/src/404.njk b/apps/pie-docs/src/404.njk index 4670ab77b2..2785507dd9 100644 --- a/apps/pie-docs/src/404.njk +++ b/apps/pie-docs/src/404.njk @@ -6,3 +6,5 @@ notFoundNarrowImgSrc: '/assets/img/404_narrow.png' --- {% include "not-found.njk" %} + +Some docs site change diff --git a/packages/components/pie-modal/src/modal.scss b/packages/components/pie-modal/src/modal.scss index 1fa771b240..1aec6e23f9 100644 --- a/packages/components/pie-modal/src/modal.scss +++ b/packages/components/pie-modal/src/modal.scss @@ -11,6 +11,8 @@ --modal-size-m: 600px; --modal-size-l: 1080px; + // Some component change + // The base modal defaults --modal-border-radius: var(--dt-radius-rounded-d); --modal-font: var(--dt-font-interactive-l-family); From a116cd6458b20f4ffe841939d7b07a569ef65d8d Mon Sep 17 00:00:00 2001 From: Xander Marjoram Date: Tue, 30 Jul 2024 11:43:39 +0100 Subject: [PATCH 3/3] Update syntax --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce517e8883..29f4d55611 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,19 +75,19 @@ jobs: - name: Verify if pie-docs has changes id: docs-check run: | - DOCS_CHANGE=$(npx -y turbo run build --filter=./apps/pie-docs...[origin/main] --dry=json | jq '.packages | length > 0') + DOCS_CHANGE=$(npx -y turbo run build --filter='./apps/pie-docs...[origin/main]' --dry=json | jq '.packages | length > 0') echo "Change Detected: $DOCS_CHANGE" echo "docs-change=$DOCS_CHANGE" >> $GITHUB_OUTPUT - name: Verify if web components have changes id: component-check run: | - COMPONENT_CHANGE=$(npx -y turbo run build --filter=./packages/components/*...[origin/main] --dry=json | jq '.packages | length > 0') + COMPONENT_CHANGE=$(npx -y turbo run build --filter='./packages/components/*...[origin/main]' --dry=json | jq '.packages | length > 0') echo "Change Detected: $COMPONENT_CHANGE" echo "web-components-change=$COMPONENT_CHANGE" >> $GITHUB_OUTPUT - name: Verify if storybook has changes id: storybook-check run: | - STORYBOOK_CHANGE=$(npx -y turbo run build --filter=./apps/pie-storybook...[origin/main] --dry=json | jq '.packages | length > 0') + STORYBOOK_CHANGE=$(npx -y turbo run build --filter='./apps/pie-storybook...[origin/main]' --dry=json | jq '.packages | length > 0') echo "Change Detected: $STORYBOOK_CHANGE" echo "storybook-change=$STORYBOOK_CHANGE" >> $GITHUB_OUTPUT @@ -198,7 +198,7 @@ jobs: - name: Run All System / Component / a11y Tests uses: ./.github/actions/run-script with: - script-name: "test:browsers:ci --filter=./packages/components/*" + script-name: "test:browsers:ci --filter='./packages/components/*'" - uses: actions/upload-artifact@v3 if: always() with: @@ -210,13 +210,13 @@ jobs: uses: ./.github/actions/run-script if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' with: - script-name: "test:visual:ci --filter=./packages/components/*...[HEAD^1]" + script-name: "test:visual:ci --filter='./packages/components/*...[HEAD^1]'" concurrency: 1 - name: Run Changed Package Visual Tests uses: ./.github/actions/run-script if: (github.event_name == 'pull_request' && github.event.pull_request.draft == false) && github.ref != 'refs/heads/main' with: - script-name: "test:visual:ci --filter=./packages/components/*...[origin/main]" + script-name: "test:visual:ci --filter='./packages/components/*...[origin/main]'" concurrency: 1 - uses: actions/upload-artifact@v3 if: always() @@ -287,7 +287,7 @@ jobs: uses: ./.github/actions/run-script if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' with: - script-name: "test:visual:ci --filter=pie-docs...[HEAD^1]" + script-name: "test:visual:ci --filter='pie-docs...[HEAD^1]'" concurrency: 1 - name: Run Changed Package Visual Tests uses: ./.github/actions/run-script