From aba065e29e7f56dba07ec36006465ad3d9c4bc1a Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Tue, 10 May 2022 00:28:03 +0200 Subject: [PATCH] Fixed some missing parts to pipelines and a mistake in wiki --- .azuredevops/modulePipelines/ms.aad.domainservices.yml | 2 ++ .../modulePipelines/ms.desktopvirtualization.scalingplans.yml | 2 ++ .../modulePipelines/ms.kubernetesconfiguration.extensions.yml | 2 ++ .../ms.kubernetesconfiguration.fluxconfigurations.yml | 2 ++ .azuredevops/modulePipelines/ms.network.frontdoors.yml | 2 ++ .github/workflows/ms.network.vpnsites.yml | 4 ++-- docs/wiki/The CI environment - Publishing.md | 2 +- 7 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.azuredevops/modulePipelines/ms.aad.domainservices.yml b/.azuredevops/modulePipelines/ms.aad.domainservices.yml index cefeecd094..c02fe1a3fa 100644 --- a/.azuredevops/modulePipelines/ms.aad.domainservices.yml +++ b/.azuredevops/modulePipelines/ms.aad.domainservices.yml @@ -10,6 +10,8 @@ parameters: type: boolean default: false +pr: none + trigger: batch: true branches: diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml index c747c0fa2e..bca677f92b 100644 --- a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml +++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml @@ -10,6 +10,8 @@ parameters: type: boolean default: false +pr: none + trigger: batch: true branches: diff --git a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml index 5e0e9aa5a8..cc977eaa62 100644 --- a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml +++ b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.extensions.yml @@ -10,6 +10,8 @@ parameters: type: boolean default: false +pr: none + trigger: batch: true branches: diff --git a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml index 74cb96bec7..9d21bee8cd 100644 --- a/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml +++ b/.azuredevops/modulePipelines/ms.kubernetesconfiguration.fluxconfigurations.yml @@ -10,6 +10,8 @@ parameters: type: boolean default: false +pr: none + trigger: batch: true branches: diff --git a/.azuredevops/modulePipelines/ms.network.frontdoors.yml b/.azuredevops/modulePipelines/ms.network.frontdoors.yml index 919ef6455c..aec0e387fd 100644 --- a/.azuredevops/modulePipelines/ms.network.frontdoors.yml +++ b/.azuredevops/modulePipelines/ms.network.frontdoors.yml @@ -10,6 +10,8 @@ parameters: type: boolean default: false +pr: none + trigger: batch: true branches: diff --git a/.github/workflows/ms.network.vpnsites.yml b/.github/workflows/ms.network.vpnsites.yml index f8f8f2344a..fb0f8c8d3f 100644 --- a/.github/workflows/ms.network.vpnsites.yml +++ b/.github/workflows/ms.network.vpnsites.yml @@ -7,12 +7,12 @@ on: type: boolean description: 'Remove deployed module' required: false - default: 'true' + default: true prerelease: type: boolean description: 'Publish prerelease module' required: false - default: 'false' + default: false push: branches: - main diff --git a/docs/wiki/The CI environment - Publishing.md b/docs/wiki/The CI environment - Publishing.md index 3fd6daea58..0c5ebbddfb 100644 --- a/docs/wiki/The CI environment - Publishing.md +++ b/docs/wiki/The CI environment - Publishing.md @@ -43,7 +43,7 @@ The publishing works as follows: Lets look at an example run where we would do a patch change on the `fileShares` module: 1. A new branch is created for further development of the `fileShare` module. Let's assume the new branch started from commit `500` on the default branch and the `version.json` of the `fileShare` module contains major and minor `0.3`. 1. Bug-fixes, documentation, and security updates are added to the `fileShare` module by the author. The `version.json` file is not changed in either the child or parent module folders. -1. The author runs a manual workflow based on their development branch, with the 'publish prerelease' option enabled. +1. The author runs a manual workflow based on their development branch, with the 'Publish prerelease module' option enabled. 1. A prerelease run of publishing triggers after test and validation of the module. - For the child and parent modules, the module version's major and minor version is read from the `version.json` file in the module folder respectively. Being unchanged, it still contains the version `0.3`. - The patch is calculated based on the total number of commits in history on the branch (independent on the module). The new branch started from commit `500` on the default branch and 1 commit has been pushed, so the total number of commits on the new branch is `501`.