diff --git a/azure-pipelines.sds.release.yml b/azure-pipelines.sds.release.yml index d11d10a49..68708b026 100644 --- a/azure-pipelines.sds.release.yml +++ b/azure-pipelines.sds.release.yml @@ -42,15 +42,6 @@ stages: workingPath: $(System.DefaultWorkingDirectory)/VideoApi/VideoApi projectName: ${{ variables.efProjectName }} migrationsPath: VideoApi/VideoApi.DAL/Migrations - - - job: Package_Nuget - displayName: "Package Nuget Packages" - steps: - - template: templates\dotnet\package-nuget-packages.yml@azTemplates - parameters: - nugetProjectPath: 'VideoApi/${{ variables.nuget_package_name }}' - vstsFeed: "${{ variables.nuget_org_name }}/${{ variables.nuget_feed_name }}" - gitVersionConfigPath: ${{ variables.git_version_config_path }} ##################################################### # Approval Gate for EF. ############################# @@ -174,24 +165,6 @@ stages: - 'latest' - '${{ variables.releaseTagName }}' - ##################################################### - # Deploy Nuget Packages. ######################### - - stage: Push_Nuget - dependsOn: Approve_Helm_Release - displayName: Deploy Nuget Packages - variables: - - template: variables/production.yaml - - template: variables/shared.yaml - parameters: - env: ${{ variables.env }} - jobs: - - job: Publish_Nuget - displayName: Publish NuGet Packages - steps: - - template: templates\dotnet\push-nuget-packages.yml@azTemplates - parameters: - vstsFeed: "${{ variables.nuget_org_name }}/${{ variables.nuget_feed_name }}" - ######################################### # Push Helm Charts to Repo. ############# - stage: Helm diff --git a/sds-git-version-config.yml b/sds-git-version-config.yml index 3e82955cb..1b4a3f528 100644 --- a/sds-git-version-config.yml +++ b/sds-git-version-config.yml @@ -1,4 +1,4 @@ -mode: ContinuousDelivery +mode: Mainline ignore: sha: [] merge-message-formats: {} @@ -7,39 +7,7 @@ minor-version-bump-message: '\+semver:\s?(feature|minor)' patch-version-bump-message: '\+semver:\s?(fix|patch)' commit-message-incrementing: Enabled branches: - main: - regex: ^origin/master$ - mode: ContinuousDelivery - tag: staging - increment: Patch - source-branches: [ 'feature', 'release', 'hotfix' ] - prevent-increment-of-merged-branch-version: true - is-mainline: true - pre-release-weight: 55000 - release: - regex: ^origin/releases?[/-] - mode: ContinuousDelivery - tag: '' - increment: None - source-branches: [ 'main', 'hotfix', 'release' ] - is-release-branch: true - feature: - regex: ^origin/features?[/-]$ - mode: ContinuousDelivery - tag: useBranchName - increment: Patch - source-branches: [ 'pull-request', 'main', 'release', 'feature', 'hotfix' ] pull-request: regex: ^(pull|pull\-requests|pr)[/-] - mode: ContinuousDelivery tag: pr- - increment: Patch - tag-number-pattern: '[/-](?\d+)[-/]' - source-branches: [ 'main', 'release', 'feature', 'hotfix' ] - hotfix: - regex: ^origin/hotfix(es)?[/-] - mode: ContinuousDelivery - tag: hotfix - increment: Patch - track-merge-target: false - source-branches: [ 'pull-request', 'main', 'release' ] \ No newline at end of file + tag-number-pattern: '[/-](?\d+)[-/]' \ No newline at end of file