Commit ea9be248 authored by Camil Staps's avatar Camil Staps 🐧

Update backend/build.sh; in util/update.sh don't exit when fetching artifacts...

Update backend/build.sh; in util/update.sh don't exit when fetching artifacts from backend does not succeed (due to set -e)
parent 7d3c6c3c
...@@ -11,9 +11,6 @@ CLMFLAGS_BOOTSTRAP:=-h 250M -nr -nortsopts\ ...@@ -11,9 +11,6 @@ CLMFLAGS_BOOTSTRAP:=-h 250M -nr -nortsopts\
-I Cloogle\ -I Cloogle\
-I Cloogle/libcloogle\ -I Cloogle/libcloogle\
-I Cloogle/CleanRegex -I Cloogle/CleanRegex
ifeq "$(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 6)" "1"
CLMFLAGS_BOOTSTRAP+=-l -no-pie
endif
CLMFLAGS:=$(CLMFLAGS_BOOTSTRAP) -funcmayfail CLMFLAGS:=$(CLMFLAGS_BOOTSTRAP) -funcmayfail
CLMLIBS_COMPILER:=\ CLMLIBS_COMPILER:=\
-I Cloogle/compiler/frontend\ -I Cloogle/compiler/frontend\
......
...@@ -15,9 +15,10 @@ if [ ! -f libs.json ]; then ln -s ../libs.json; fi ...@@ -15,9 +15,10 @@ if [ ! -f libs.json ]; then ln -s ../libs.json; fi
./CloogleServer --rank-settings-constraints rank_settings_constraints.json > rank_settings.json ./CloogleServer --rank-settings-constraints rank_settings_constraints.json > rank_settings.json
rm -rf \ rm -rf \
Builtin \
Cloogle \ Cloogle \
Util \
Clean\ System\ Files \ Clean\ System\ Files \
clean-compiler \
*.dcl *.icl \ *.dcl *.icl \
Dockerfile \ Dockerfile \
Makefile \ Makefile \
......
...@@ -89,9 +89,9 @@ if [[ "$RELEASE_DIRECTORY" != "" ]]; then ...@@ -89,9 +89,9 @@ if [[ "$RELEASE_DIRECTORY" != "" ]]; then
sed 's/\x1b\[[0-9;]*m//g' /tmp/cloogle-build.log \ sed 's/\x1b\[[0-9;]*m//g' /tmp/cloogle-build.log \
| sed -n '/^\.\/builddb /{:a;n;/^Execution: /{p;b};p;ba}' \ | sed -n '/^\.\/builddb /{:a;n;/^Execution: /{p;b};p;ba}' \
> "$THIS_RELEASE/build-log.txt" > "$THIS_RELEASE/build-log.txt"
timeout -k 10 10 sudo docker-compose exec -T backend cat rank_settings.json > "$THIS_RELEASE/rank_settings.json" timeout -k 10 10 sudo docker-compose exec -T backend cat rank_settings.json > "$THIS_RELEASE/rank_settings.json" || echo "could not publish rank settings"
timeout -k 10 10 sudo docker-compose exec -T backend cat types.json > "$THIS_RELEASE/types.json" timeout -k 10 10 sudo docker-compose exec -T backend cat types.json > "$THIS_RELEASE/types.json" || echo "could not publish database"
timeout -k 10 10 sudo docker-compose exec -T backend cat typetree.dot > "$THIS_RELEASE/typetree.dot" timeout -k 10 10 sudo docker-compose exec -T backend cat typetree.dot > "$THIS_RELEASE/typetree.dot" || echo "could not publish type tree"
fi fi
echo -en "\033[0m" echo -en "\033[0m"
echo "--> Cloogle build succeeded." echo "--> Cloogle build succeeded."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment