File tree 2 files changed +9
-9
lines changed
2 files changed +9
-9
lines changed Original file line number Diff line number Diff line change 4
4
printf " Detect changes for: $1 >> $2 \n\n"
5
5
6
6
b1=" ${1// ' /' / ' _' } "
7
- printf " Branch alias: $b1 \n"
8
7
# list all dirs in source branch
9
8
python .actions/assistant.py list_dirs > " dirs-$b1 .txt"
10
- cat " dirs-$b1 .txt"
9
+ printf " Branch alias: $b1 \n " && cat " dirs-$b1 .txt"
11
10
12
11
head=$( git rev-parse origin/$2 )
13
12
git diff --name-only $head --output=target-diff.txt
@@ -19,19 +18,16 @@ cp -r .actions/ _TEMP/.actions/
19
18
20
19
git checkout $2
21
20
b2=" ${2// ' /' / ' _' } "
22
- printf " Branch alias: $b2 \n"
23
21
# recover the original CLI
24
22
# rm -rf .actions && mv _TEMP/.actions .actions
25
23
# list all dirs in target branch
26
24
python _TEMP/.actions/assistant.py list_dirs " .notebooks" --include_file_ext=" .ipynb" > " dirs-$b2 .txt"
27
- cat " dirs-$b2 .txt"
25
+ printf " Branch alias: $b2 \n " && cat " dirs-$b2 .txt"
28
26
29
27
printf " \n\n"
30
28
git merge --ff -s resolve origin/$1
31
29
32
30
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----------------\n"
34
- cat changed-folders.txt
35
- printf " \n================\nDropped folders:\n----------------\n"
36
- cat dropped-folders.txt
37
- printf " \n"
31
+ printf " \n================\nChanged folders:\n----------------\n" && cat changed-folders.txt
32
+ printf " \n================\nDropped folders:\n----------------\n" && cat dropped-folders.txt
33
+
Original file line number Diff line number Diff line change 12
12
- job : sync_pub
13
13
pool :
14
14
vmImage : " Ubuntu-20.04"
15
+ workspace :
16
+ clean : all
15
17
variables :
16
18
ACCELERATOR : CPU,GPU
17
19
PUB_BRANCH : publication
90
92
container :
91
93
image : $(docker-image)
92
94
options : " --gpus=all --shm-size=32g -v /usr/bin/docker:/tmp/docker:ro"
95
+ workspace :
96
+ clean : all
93
97
94
98
variables :
95
99
ACCELERATOR : CPU,GPU
You can’t perform that action at this time.
0 commit comments