Skip to content
Snippets Groups Projects
Commit 35da0af5 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Prevent the building of the opam packages if not on the master branch

parent 1dc20933
No related branches found
No related tags found
1 merge request!1WIP: Resolve "Can not iterate over the plus node (as long as it is named plus)"
......@@ -58,8 +58,10 @@ update_version:
git add src/lv6version.ml
make clean && make
BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
cia:
test -f committed && \
test -f committed && \
echo "*** I won't commit!\n*** until you 'make update_version'!" \
|| (git commit -a -F log && touch committed) && echo "Hint: 'make ci' to test the CI before doing 'make 'push'"
......@@ -99,7 +101,7 @@ $(WWWTEST)/pool/$(PACKNAME).tgz: $(PACKNAME).tgz
opam : $(WWW)/pool/$(PACKNAME).tgz
test -f committed && ( \
[ $(BRANCH) = "master" ] && test -f committed && ( \
cd $(WWW)/opam-repository/packages && \
oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \
cp ~/lus2lic/opam $(OPAM_FILE) && \
......@@ -109,7 +111,7 @@ opam : $(WWW)/pool/$(PACKNAME).tgz
cp -rf $(OPAM_DIR) $(OFFICIAL_OPAM_DIR)
opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz
cd $(WWWTEST)/opam-repository/packages && \
[ $(BRANCH) = "master" ] && cd $(WWWTEST)/opam-repository/packages && \
oasis2opam $(HTTPTEST)/pool/$(PACKNAME).tgz && \
cp ~/lus2lic/opam $(OPAM_FILE_TEST) && \
cd .. ; opam-admin check && opam-admin make -g
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment