From 74ed37f2e84174445c670663db4c30d52fd4bc4f Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 31 Jan 2023 10:12:05 +0100 Subject: [PATCH 1/5] disable storybook and static build for PRs --- ...azure-static-web-apps-ambitious-stone-0033b3603.yml | 8 ++++---- .../azure-static-web-apps-ashy-bay-09f36a803.yml | 10 ++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/azure-static-web-apps-ambitious-stone-0033b3603.yml b/src/Umbraco.Web.UI.Client/.github/workflows/azure-static-web-apps-ambitious-stone-0033b3603.yml index 57943048e3..ee460e8053 100644 --- a/src/Umbraco.Web.UI.Client/.github/workflows/azure-static-web-apps-ambitious-stone-0033b3603.yml +++ b/src/Umbraco.Web.UI.Client/.github/workflows/azure-static-web-apps-ambitious-stone-0033b3603.yml @@ -4,10 +4,10 @@ on: push: branches: - main - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - main + # pull_request: + # types: [opened, synchronize, reopened, closed] + # branches: + # - main jobs: build_and_deploy_job: diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml b/src/Umbraco.Web.UI.Client/.github/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml index 58fed09483..3e9e2ceaaa 100644 --- a/src/Umbraco.Web.UI.Client/.github/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml +++ b/src/Umbraco.Web.UI.Client/.github/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml @@ -4,12 +4,10 @@ on: push: branches: - main - paths-ignore: - - '**/*.md' - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - main + # pull_request: + # types: [opened, synchronize, reopened, closed] + # branches: + # - main jobs: build_and_deploy_job: From 7cb874b3234578753ad89cdee4f762348af6194b Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 31 Jan 2023 10:12:30 +0100 Subject: [PATCH 2/5] only test firefox and webkit --- src/Umbraco.Web.UI.Client/web-test-runner.config.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index 69c726e3a3..b71228b062 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -32,7 +32,6 @@ export default { }), ], browsers: [ - playwrightLauncher({ product: 'chromium' }), playwrightLauncher({ product: 'firefox' }), playwrightLauncher({ product: 'webkit' }), ], From 92336fbc708fe1809efe9669ed4f3223e96001db Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 31 Jan 2023 10:16:13 +0100 Subject: [PATCH 3/5] only run devskim on push to main --- src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml b/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml index 9e1716fdca..28ce6e06eb 100644 --- a/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml +++ b/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml @@ -8,8 +8,6 @@ name: DevSkim on: push: branches: [ "main" ] - pull_request: - branches: [ "main" ] schedule: - cron: '19 14 * * 5' From 90a693a72bae8b3af60bf6fa90785807c251c1b1 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 31 Jan 2023 10:34:44 +0100 Subject: [PATCH 4/5] add status badges for builds that are now only run automatically on main branch --- src/Umbraco.Web.UI.Client/.github/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/.github/README.md b/src/Umbraco.Web.UI.Client/.github/README.md index 9cc0f21d62..b7ab9a0c00 100644 --- a/src/Umbraco.Web.UI.Client/.github/README.md +++ b/src/Umbraco.Web.UI.Client/.github/README.md @@ -1,5 +1,9 @@ # Umbraco.CMS.Backoffice +[![Storybook](https://github.com/umbraco/Umbraco.CMS.Backoffice/actions/workflows/azure-static-web-apps-ambitious-stone-0033b3603.yml/badge.svg)](https://github.com/umbraco/Umbraco.CMS.Backoffice/actions/workflows/azure-static-web-apps-ambitious-stone-0033b3603.yml) +| +[![Static Web App](https://github.com/umbraco/Umbraco.CMS.Backoffice/actions/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml/badge.svg)](https://github.com/umbraco/Umbraco.CMS.Backoffice/actions/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml) + ## Installation instructions 1. Run `npm install` From 8aabc9232a5b6a931e7d865c9ec281e9dd984deb Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 31 Jan 2023 10:38:49 +0100 Subject: [PATCH 5/5] formatting for single-line --- src/Umbraco.Web.UI.Client/.github/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/.github/README.md b/src/Umbraco.Web.UI.Client/.github/README.md index b7ab9a0c00..5d50e21a29 100644 --- a/src/Umbraco.Web.UI.Client/.github/README.md +++ b/src/Umbraco.Web.UI.Client/.github/README.md @@ -1,8 +1,6 @@ # Umbraco.CMS.Backoffice -[![Storybook](https://github.com/umbraco/Umbraco.CMS.Backoffice/actions/workflows/azure-static-web-apps-ambitious-stone-0033b3603.yml/badge.svg)](https://github.com/umbraco/Umbraco.CMS.Backoffice/actions/workflows/azure-static-web-apps-ambitious-stone-0033b3603.yml) -| -[![Static Web App](https://github.com/umbraco/Umbraco.CMS.Backoffice/actions/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml/badge.svg)](https://github.com/umbraco/Umbraco.CMS.Backoffice/actions/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml) +[![Storybook](https://github.com/umbraco/Umbraco.CMS.Backoffice/actions/workflows/azure-static-web-apps-ambitious-stone-0033b3603.yml/badge.svg)](https://github.com/umbraco/Umbraco.CMS.Backoffice/actions/workflows/azure-static-web-apps-ambitious-stone-0033b3603.yml) [![Static Web App](https://github.com/umbraco/Umbraco.CMS.Backoffice/actions/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml/badge.svg)](https://github.com/umbraco/Umbraco.CMS.Backoffice/actions/workflows/azure-static-web-apps-ashy-bay-09f36a803.yml) ## Installation instructions