Skip to content

Commit fc0a666

Browse files
author
Pavel Marek
committed
[GR-30277] Re-enable API checksum of recommended packages cache.
PullRequest: fastr/2621
2 parents ef701aa + 715eb2f commit fc0a666

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ overlay : 'ba6d182f8e560788c71893ace6cbfd203b319430' }
1+
{ overlay : 'e565981724ace844458c602b1681bf940271c66e' }

com.oracle.truffle.r.native.recommended/Makefile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,19 @@ ifdef FASTR_RECOMMENDED_BINARY
8585
$(info Using FastR recommended packages binary: $(FASTR_RECOMMENDED_BINARY))
8686

8787
install.recommended: $(GNUR_RECOMMENDED_TARS)
88-
# if ! (mx -p $(FASTR_R_HOME) r-pkgcache --print-api-checksum --vm fastr | tail -n 1 | diff -q $(FASTR_RECOMMENDED_BINARY)/api-checksum.txt -); then \
89-
# echo "******************************"; \
90-
# echo "ERROR:"; \
91-
# echo "The checksum of FastR header files does not match the checksum that the recommended packages were build against."; \
92-
# echo "You can run appropriate CI jobs in FastR repo to generate a new version of recommended packages binary and then upload it to the appropriate place."; \
93-
# echo "******************************"; \
94-
# echo "Actual checksum of FastR headers:"; \
95-
# echo "$(mx -p $(FASTR_R_HOME) r-pkgcache --print-api-checksum --vm fastr)"; \
96-
# echo "Expected checksum by the recommended pkgs:"; \
97-
# cat $(FASTR_RECOMMENDED_BINARY)/api-checksum.txt; \
98-
# echo "******************************"; \
99-
# exit 1; \
100-
# fi
88+
if ! (mx -p $(FASTR_R_HOME) r-pkgcache --print-api-checksum --vm fastr | tail -n 1 | diff -q $(FASTR_RECOMMENDED_BINARY)/api-checksum.txt -); then \
89+
echo "******************************"; \
90+
echo "ERROR:"; \
91+
echo "The checksum of FastR header files does not match the checksum that the recommended packages were build against."; \
92+
echo "You can run appropriate CI jobs in FastR repo to generate a new version of recommended packages binary and then upload it to the appropriate place."; \
93+
echo "******************************"; \
94+
echo "Actual checksum of FastR headers:"; \
95+
echo "$(mx -p $(FASTR_R_HOME) r-pkgcache --print-api-checksum --vm fastr)"; \
96+
echo "Expected checksum by the recommended pkgs:"; \
97+
cat $(FASTR_RECOMMENDED_BINARY)/api-checksum.txt; \
98+
echo "******************************"; \
99+
exit 1; \
100+
fi
101101
cp -R $(FASTR_RECOMMENDED_BINARY)/pkgs/* $(FASTR_R_HOME)/library
102102
touch install.recommended
103103

0 commit comments

Comments
 (0)