diff --git a/Makefile.dev b/Makefile.dev index f262d913043f9d940b4678abe3033509dc98014b..68cfdc33d54f022492993e13abd7fd80307db85a 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -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