Merge 389bb33 into 61c8383

Author: nvarscar

azure-main.yml

@@ -6,11 +6,6 @@ trigger:
     exclude:
       - docs
       - README.md
-# resources:
-#   repositories:
-#   - repository: self
-#     type: git
-#     ref: main
 jobs:
 - job: cut_new_release_branch
   displayName: Agent phase
@@ -22,14 +17,11 @@ jobs:
     clean: true
     persistCredentials: True
   - task: PowerShell@2
-    displayName: Bump up version
+    displayName: Bump up version and cut a release branch
     inputs:
       filePath: .\build\bump_version.ps1
       arguments: .\dbops.psd1
-  - task: PowerShell@2
-    displayName: Cut a release branch
-    inputs:
-      filePath: .\build\git_release.ps1
     env:
       git_user_email: $(gitUserEmail)
-      git_username: $(gitUsername)
+      git_username: $(gitUsername)
+      MY_ACCESS_TOKEN: $(System.AccessToken)

azure-release.yml

@@ -24,11 +24,11 @@ jobs:
   - task: PowerShell@2
     displayName: Copy libraries
     inputs:
-      filePath: .\copy_build_files.ps1
-      arguments: .\dbops
+      filePath: .\build\copy_build_files.ps1
   - task: PowerShell@2
     displayName: Create folder and move files to it
     inputs:
+      targetType: inline
       script: |
         New-Item dbops -Type Directory
         Get-Item bin, functions, internal, *.ps*1, license.txt | Foreach-Object { Move-Item $_ .\dbops }

build/bump_version.ps1

@@ -1,6 +1,8 @@
 Param (
     $Path = '.\dbops.psd1'
 )
+git config --global user.email $env:git_user_email
+git config --global user.name $env:git_username
 $moduleFile = Invoke-Command -ScriptBlock ([scriptblock]::Create((Get-Content $Path -Raw)))
 $version = [Version]$moduleFile.ModuleVersion
 $regEx = "^([\s]*ModuleVersion[\s]*\=[\s]*)\'(" + [regex]::Escape($version) + ")\'[\s]*`$"
@@ -15,4 +17,9 @@ if ($version -le $publishedVersion) {
     $content | Foreach-Object { $_ -replace $regEx, "`$1'$newVersion'" } | Out-File $Path -Force -Encoding utf8
     $newModuleFile = Invoke-Command -ScriptBlock ([scriptblock]::Create((Get-Content $Path -Raw)))
     Write-Host "New build $($newModuleFile.ModuleVersion)"
-}
+    git add $moduleFile
+    git commit -m "v$version"
+}
+git push origin HEAD:development
+git branch release/$version
+git push --all origin

build/git_release.ps1

@@ -4,7 +4,7 @@
     RootModule             = 'dbops.psm1'
 
     # Version number of this module.
-    ModuleVersion          = '0.6.5'
+    ModuleVersion          = '0.7.0'
 
     # ID used to uniquely identify this module
     GUID                   = '16dff216-533a-4fa3-9b2e-4408dbe15e63'