Skip to content

Publishing: Improve diff comparison when on custom branch #1058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MariusStorhaug merged 21 commits into from
Mar 3, 2022
Merged

Publishing: Improve diff comparison when on custom branch #1058

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dc35bf7
Test change on SA
MariusStorhaug Feb 28, 2022
24e459d
Testing diff with main
MariusStorhaug Feb 28, 2022
1981a8d
Rapid test of SA
MariusStorhaug Feb 28, 2022
bf12cf7
Test remote and branch
Mar 1, 2022
1466e34
remove remote and branch
Mar 1, 2022
c658294
Test with head and some other logic
Mar 1, 2022
34e2b19
fetch
Mar 1, 2022
bf22eea
test
Mar 1, 2022
9d09372
test
Mar 1, 2022
4e5f9cc
Update ms.storage.storageaccounts.yml
Mar 1, 2022
2700f76
test
Mar 1, 2022
f8d2c1a
Merge branch 'users/mast/publishDiffFix' of https://github.com/Azure/…
Mar 1, 2022
81a9b98
test
Mar 1, 2022
3dbcd59
Check content in env
Mar 1, 2022
60e2d75
testing dual approach
Mar 1, 2022
d7e0582
fix
Mar 1, 2022
8d367f4
Adding origin and cleaning up function
MariusStorhaug Mar 1, 2022
28f37fb
Fix diff checker for publish
MariusStorhaug Mar 3, 2022
9b4df5c
reset pipelines
MariusStorhaug Mar 3, 2022
17c171c
Merge branch 'main' of https://github.com/Azure/ResourceModules into …
MariusStorhaug Mar 3, 2022
e693b77
cleanup
MariusStorhaug Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 15 additions & 20 deletions utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,32 @@

<#
.SYNOPSIS
Get modified files between two commits.

.PARAMETER Commit
Optional. A git reference to base the comparison on.

.PARAMETER CompareCommit
Optional. A git reference to compare with.
Get modified files between previous and current commit depending on if you are running on main/master or a custom branch.

.EXAMPLE
Get-ModifiedFileList -Commit "HEAD^" -CompareCommit "HEAD"
Get-ModifiedFileList

Directory: C:\Repo\Azure\ResourceModules\utilities\pipelines\resourcePublish

Mode LastWriteTime Length Name
---- ------------- ------ ----
la--- 08.12.2021 15:50 7133 Script.ps1

Get modified files between previous and current commit.
Get modified files between previous and current commit depending on if you are running on main/master or a custom branch.
#>
function Get-ModifiedFileList {
[CmdletBinding()]
param (
[Parameter(Mandatory = $false)]
[string] $Commit = 'HEAD',

[Parameter(Mandatory = $false)]
[string] $CompareCommit = 'HEAD^'
)

Write-Verbose "Gathering modified files between [$CompareCommit] and [$Commit]" -Verbose
$Diff = git diff --name-only --diff-filter=AM $CompareCommit $Commit
$CurrentBranch = Get-GitBranchName
if (($CurrentBranch -eq 'main') -or ($CurrentBranch -eq 'master')) {
Write-Verbose 'Gathering modified files from the pull request' -Verbose
$Diff = git diff --name-only --diff-filter=AM HEAD^ HEAD
} else {
Write-Verbose 'Gathering modified files between current branch and main' -Verbose
$Diff = git diff --name-only --diff-filter=AM origin/main
if ($Diff.count -eq 0) {
Write-Verbose 'Gathering modified files between current branch and master' -Verbose
$Diff = git diff --name-only --diff-filter=AM origin/master
}
}
$ModifiedFiles = $Diff | Get-Item -Force

return $ModifiedFiles
Expand Down