Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
verimag
synchrone
lutils
Commits
5d0403f9
Commit
5d0403f9
authored
Apr 05, 2019
by
erwan
Browse files
Update: clean-up Makefile.dev
parent
70ef9101
Pipeline
#23479
passed with stages
in 3 minutes and 28 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Makefile.dev
View file @
5d0403f9
#######################################################################################
# Workflow:
# C=make cia ; A=make amend ; U=make uv ; P=make opam-rel
# - to make sure the sha and the version are good, one should never
# do U and then A.
# - to make sure git is not confused, one should never do A and then P
#
# therefore, to avoid such problems, legal trace are defined by this automata:
# 0 -C-> 1
# 1 -A-> 1
# 1 -P-> 2
# 2 -U-> 0
# 1 -U-> 0
# to implement such a workflow, C puts a lock (state 1) and U removes it (state 0)
###############################
# typical workflow:
# uv -> cia+ -> amend* -> push ->
# wait for gitlab release job -> pull (to get the release tag)
# and then; optionnaly, to release an opam version:
# opam-rel
# In case of an opam-rel, it is nice to chech that
# https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/tools-distrib/pipelines
# still works
###############################
###############################
# a few git shortcuts
# a few git shortcuts
...
@@ -37,21 +13,19 @@ ifneq (,$(findstring -,$(VERSION)))
...
@@ -37,21 +13,19 @@ ifneq (,$(findstring -,$(VERSION)))
else
else
cat
_oasis.save |
sed
"s/^Version:.*/Version:
$(VERSION)
/"
>
_oasis
cat
_oasis.save |
sed
"s/^Version:.*/Version:
$(VERSION)
/"
>
_oasis
endif
endif
rm
-f
committed
make clean
&&
make
make clean
&&
make
cia
:
test
cia
:
test
test
-f
committed
&&
\
git commit
-a
-F
log
echo
"*** I won't commit!
\n
*** until you 'make update_version'!"
\
||
(
git commit
-a
-F
log
&&
touch
committed
)
ci
:
ci
:
test
-f
committed
&&
\
git commit
-F
log
echo
"*** I won't commit!
\n
*** until you 'make update_version'!"
\
||
(
git commit
-F
log
&&
touch
committed
)
push
:
opam-test
push
:
opam-test
git push
git push
&&
\
echo
"https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/pipelines"
\
&&
echo
"if the CI is fine, consider issuing a 'make opam-rel'"
merge
:
merge_work_into_master
merge
:
merge_work_into_master
merge_work_into_master
:
merge_work_into_master
:
...
@@ -60,7 +34,7 @@ merge_work_into_master:
...
@@ -60,7 +34,7 @@ merge_work_into_master:
git push "
git push "
amend
:
amend
:
test
-f
committed
&&
git commit
-a
-F
log
--amend
git commit
-a
-F
log
--amend
###############################
###############################
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment