Skip to content

Commit 1db7dd4

Browse files
authored
Update transform-notebooks.yml
1 parent b35567d commit 1db7dd4

File tree

1 file changed

+15
-21
lines changed

1 file changed

+15
-21
lines changed

.github/workflows/transform-notebooks.yml

+15-21
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
4141
- name: Strip outputs from .ipynb files
4242
run: |
43+
git pull
4344
dirs=(PM1 PM2 PM3 PM4 PM5 CM1 CM2 CM3 AC1 AC2 T)
4445
for dir in "${dirs[@]}"; do
4546
# Check if directory exists
@@ -64,12 +65,17 @@ jobs:
6465
fi
6566
done
6667
echo "Converting .irnb to .Rmd to update the .Rmd version"
68+
# first we delete all Rmd files and regenerate. This will make sure
69+
# that if a .irnb file is deleted then the corresponding .Rmd file
70+
# will also be removed by this script.
71+
git rm "$dir"/*.Rmd
6772
R -e "
6873
files <- list.files(path = '$dir', pattern = '\\\\.irnb$', full.names = TRUE, recursive = FALSE)
6974
lapply(files, function(input) {
7075
rmarkdown::convert_ipynb(input)
7176
})
7277
"
78+
git add "$dir"/*.Rmd
7379
else
7480
echo "Directory $dir does not exist."
7581
fi
@@ -79,27 +85,15 @@ jobs:
7985
id: verify_diff
8086
run: |
8187
git pull
82-
dirs=(PM1 PM2 PM3 PM4 PM5 CM1 CM2 CM3 AC1 AC2 T)
83-
for dir in "${dirs[@]}"; do
84-
# Check if directory exists
85-
if [ -d "$dir" ]; then
86-
echo "Processing directory: $dir"
87-
git add "$dir"/*.ipynb "$dir"/*.irnb "$dir"/*.Rmd
88-
git diff "$dir"/*.ipynb "$dir"/*.irnb "$dir"/*.Rmd
89-
CHANGES=$(git status --porcelain)
90-
91-
if [ -z "$CHANGES" ]; then
92-
# if git diff --quiet "$dir"/*.ipynb "$dir"/*.irnb "$dir"/*.Rmd; then
93-
echo "No changes were found"
94-
else
95-
echo "Found changes in directory: $dir"
96-
echo "changed=true" >> $GITHUB_OUTPUT
97-
break 1
98-
fi
99-
else
100-
echo "Directory $dir does not exist."
101-
fi
102-
done
88+
git status --porcelain
89+
CHANGES=$(git status --porcelain)
90+
if [ -z "$CHANGES" ]; then
91+
echo "No changes were found"
92+
else
93+
echo "Found changes"
94+
echo "$CHANGES"
95+
echo "changed=true" >> $GITHUB_OUTPUT
96+
fi
10397
10498
- name: Commit and push stripped .ipynb files
10599
if: steps.verify_diff.outputs.changed == 'true'

0 commit comments

Comments
 (0)