Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
ReLoC-v1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dan Frumin
ReLoC-v1
Commits
52f32aaa
Commit
52f32aaa
authored
May 14, 2018
by
Ralf Jung
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ralf/ci' into 'master'
update Makefile and CI See merge request
!2
parents
629187f1
262c9d8a
Pipeline
#8641
passed with stage
in 12 minutes and 22 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
Makefile
Makefile
+6
-4
ci
ci
+1
-1
No files found.
Makefile
View file @
52f32aaa
...
...
@@ -31,13 +31,15 @@ build-dep: build-dep/opam phony
@
# that are incompatible with our build requirements.
@
# To achieve this, we create a fake opam package that has our build-dependencies as
@
# dependencies, but does not actually install anything.
@
# Reinstalling is needed
in case the pin already exists, but the builddep package changed.
@
#
Once we depend on opam 2, we can remove that last step
.
@
# Reinstalling is needed
with opam 1 in case the pin already exists, but the builddep
@
#
package changed
.
@
BUILD_DEP_PACKAGE
=
"
$$
(egrep "
^name:
" build-dep/opam | sed 's/^name: *"
\(
.
*
\)
" */
\1
/')"
;
\
echo
"# Pinning build-dep package."
&&
\
opam pin add
-k
path
$(OPAMFLAGS)
"
$$
BUILD_DEP_PACKAGE"
.dev build-dep
&&
\
echo
"# Reinstalling build-dep package."
&&
\
opam reinstall
$(OPAMFLAGS)
"
$$
BUILD_DEP_PACKAGE"
((!
opam
--version
|
grep
"^1
\.
"
>
/dev/null
)
||
(
\
echo
"# Reinstalling build-dep package."
&&
\
opam reinstall
$(OPAMFLAGS)
"
$$
BUILD_DEP_PACKAGE"
\
))
# Some files that do *not* need to be forwarded to Makefile.coq
Makefile
:
;
...
...
ci
@
99c935d2
Compare
40b71102
...
99c935d2
Subproject commit
40b71102efe051c777a785035aebcbaa4c2ec19f
Subproject commit
99c935d2007358fe4028560e96f9c136e608e696
Write
Preview
Markdown
is supported
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