Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.recipe.build
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
slapos.recipe.build
Commits
5b69b5c6
Commit
5b69b5c6
authored
Jan 18, 2019
by
Ayush Tiwari
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More robust check for update
parent
de170a56
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
README.rst
README.rst
+1
-1
slapos/recipe/build/tests.py
slapos/recipe/build/tests.py
+10
-0
No files found.
README.rst
View file @
5b69b5c6
...
...
@@ -325,7 +325,7 @@ and branch parameter is ignored::
Setup a "develop" repository
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If you need to setup a repository that will be manually alterate
d
over time for
If you need to setup a repository that will be manually alterate over time for
development purposes, you need to make sure buildout will NOT alter it and NOT
erase your local modifications by specifying the "develop" flag::
...
...
slapos/recipe/build/tests.py
View file @
5b69b5c6
...
...
@@ -284,6 +284,16 @@ revision = %s
head_commit_submodule_after_first_revision
=
self
.
getRepositoryHeadCommit
(
submodule_repo_path
)
# Change the HEAD of the cloned repository and then run buildout
check_call
([
'git'
,
'reset'
,
'--hard'
,
'HEAD'
],
cwd
=
main_repo_path
)
# Update buildout. This should fetch and reset to the revision given in
# the buildout
check_call
([
buildout
])
head_commit_parent_repo_after_update
=
self
.
getRepositoryHeadCommit
(
main_repo_path
)
self
.
assertEqual
(
head_commit_parent_repo_after_update
,
self
.
getRepositoryHeadCommit
(
self
.
project_dir
))
# Update main repo with changes of submodule
submodule_dir_main_repo
=
os
.
path
.
join
(
self
.
project_dir
,
'dir1'
,
'submodule_repo'
)
...
...
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