File tree 3 files changed +6
-6
lines changed
3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -526,15 +526,15 @@ def group_folders(
526
526
with open (fpath_gitdiff ) as fopen :
527
527
changed = [ln .strip () for ln in fopen .readlines ()]
528
528
dirs = [os .path .dirname (ln ) for ln in changed ]
529
- # not empty paths
530
- dirs = [ln for ln in dirs if ln ]
531
529
532
530
if fpath_actual_dirs :
533
531
assert isinstance (fpath_actual_dirs , list )
534
532
assert all (os .path .isfile (p ) for p in fpath_actual_dirs )
535
533
dir_sets = [{ln .strip () for ln in open (fp ).readlines ()} for fp in fpath_actual_dirs ]
536
534
# get only different
537
535
dirs += list (set .union (* dir_sets ) - set .intersection (* dir_sets ))
536
+ # not empty paths
537
+ dirs = [ln for ln in dirs if ln ]
538
538
539
539
if root_path :
540
540
dirs = [os .path .join (root_path , d ) for d in dirs ]
Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
2
3
- set -e
3
+ set -ex
4
4
printf " Detect changes for: $1 >> $2 \n\n"
5
5
6
6
b1=" ${1// ' /' / ' _' } "
@@ -30,8 +30,8 @@ printf "\n\n"
30
30
git merge --ff -s resolve origin/$1
31
31
32
32
python _TEMP/.actions/assistant.py group-folders target-diff.txt --fpath_actual_dirs " ['dirs-$b1 .txt', 'dirs-$b2 .txt']"
33
- printf " \n\nChanged folders:\n"
33
+ printf " \n================ \nChanged folders:\n---------------- \n"
34
34
cat changed-folders.txt
35
- printf " \n\nDropped folders:\n"
35
+ printf " \n================ \nDropped folders:\n---------------- \n"
36
36
cat dropped-folders.txt
37
37
printf " \n"
Original file line number Diff line number Diff line change 37
37
displayName : " Install dependencies"
38
38
- bash : |
39
39
current_branch=$(cut -d '/' -f3- <<< $(Build.SourceBranch))
40
- printf "$current_branch\n"
40
+ printf "Current branch: $current_branch\n"
41
41
bash .actions/git-diff-sync.sh $current_branch $(PUB_BRANCH)
42
42
displayName: "Compare changes & sync"
43
43
You can’t perform that action at this time.
0 commit comments