Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
MDANSE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
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
Scientific Software
MDANSE
Commits
dc471047
Commit
dc471047
authored
Mar 07, 2017
by
eric pellegrini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix when setting the commit id in __pkginfo__
parent
bff8e7d3
Pipeline
#1497
passed with stages
in 6 minutes and 42 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
14 deletions
+14
-14
BuildServer/Darwin/Scripts/run_build.sh
BuildServer/Darwin/Scripts/run_build.sh
+4
-1
BuildServer/Darwin/Scripts/run_deploy.sh
BuildServer/Darwin/Scripts/run_deploy.sh
+0
-3
BuildServer/Debian/run_build.sh
BuildServer/Debian/run_build.sh
+4
-1
BuildServer/Debian/run_deploy.sh
BuildServer/Debian/run_deploy.sh
+1
-4
BuildServer/Windows/run_build.sh
BuildServer/Windows/run_build.sh
+4
-1
BuildServer/Windows/run_deploy.sh
BuildServer/Windows/run_deploy.sh
+1
-4
No files found.
BuildServer/Darwin/Scripts/run_build.sh
View file @
dc471047
...
...
@@ -16,8 +16,11 @@ BUILD_TARGET=darwin
# take the latest version of nmoldyn available on the forge
echo
-e
"
$BLEU
""Getting last MDANSE revision"
"
$NORMAL
"
#
Get revision number from git (without trailing newline)
#
Update the __pkginfo__ file with the current commit. The sed -i "" is compulsory other crashes on macos
COMMIT_ID
=
$(
git rev-parse
--long
HEAD
)
sed
-i
""
"s/.*__commit__.*/__commit__ =
\"
${
COMMIT_ID
}
\"
/"
MDANSE/__pkginfo__.py
# Get revision number from git (without trailing newline)
echo
-e
"
$BLEU
""Commit id =
${
COMMIT_ID
}
"
"
$NORMAL
"
# Now build last version and install it in our homebrewed python
...
...
BuildServer/Darwin/Scripts/run_deploy.sh
View file @
dc471047
...
...
@@ -10,10 +10,7 @@
ROUGE
=
"
\\
033[1;31m"
BLEU
=
"
\\
033[1;34m"
# Update the __pkginfo__ file with the current commit
COMMIT_ID
=
$(
git rev-parse
--long
HEAD
)
sed
-i
's/.*__commit__.*/__commit__ = \"${COMMIT_ID}\"/'
MDANSE/__pkginfo__.py
VERSION_NAME
=
`
sed
-n
's/__version__.*=.*\"\(.*\)\"/\1/p'
MDANSE/__pkginfo__.py
`
if
[[
${
CI_BUILD_REF_NAME
}
=
~ develop
]]
...
...
BuildServer/Debian/run_build.sh
View file @
dc471047
...
...
@@ -13,8 +13,11 @@ BLEU="\\033[1;34m"
cd
cd
$CI_PROJECT_DIR
#
Get revision number from git (without trailing newline)
#
Update the __pkginfo__ file with the current commit
COMMIT_ID
=
$(
git rev-parse
--long
HEAD
)
sed
-i
"s/.*__commit__.*/__commit__ =
\"
${
COMMIT_ID
}
\"
/"
MDANSE/__pkginfo__.py
# Get revision number from git (without trailing newline)
echo
-e
"
$BLEU
""Commit id =
${
COMMIT_ID
}
<--"
"
$NORMAL
"
# Now build last version
...
...
BuildServer/Debian/run_deploy.sh
View file @
dc471047
...
...
@@ -11,10 +11,7 @@ export DISTRO=$2
ROUGE
=
"
\\
033[1;31m"
BLEU
=
"
\\
033[1;34m"
# Update the __pkginfo__ file with the current commit
COMMIT_ID
=
$(
git rev-parse
--long
HEAD
)
sed
-i
's/.*__commit__.*/__commit__ = \"${COMMIT_ID}\"/'
MDANSE/__pkginfo__.py
VERSION_NAME
=
`
sed
-n
's/__version__.*=.*\"\(.*\)\"/\1/p'
MDANSE/__pkginfo__.py
`
if
[[
${
CI_BUILD_REF_NAME
}
=
~ develop
]]
...
...
@@ -23,7 +20,7 @@ then
then
VERSION_NAME
=
${
VERSION_NAME
}
-
"weekly-"
`
date
+%Y-%m-%d
`
fi
VERSION_NAME
=
${
VERSION_NAME
}
-
`
git rev-parse
--short
HEAD
`
VERSION_NAME
=
${
VERSION_NAME
}
-
${
COMMIT_ID
}
fi
##Select the build target
...
...
BuildServer/Windows/run_build.sh
View file @
dc471047
...
...
@@ -194,8 +194,11 @@ rm pythonlog.txt
cd
${
CI_PROJECT_DIR
}
#
Get revision number from GIT
#
Update the __pkginfo__ file with the current commit
COMMIT_ID
=
$(
git rev-parse
--long
HEAD
)
sed
-i
"s/.*__commit__.*/__commit__ =
\"
${
COMMIT_ID
}
\"
/"
MDANSE/__pkginfo__.py
# Get revision number from GIT
echo
"Commit id
${
COMMIT_ID
}
"
# setup the environment for a visual studio build of MDANSE using microsoft SDK 7.0 and build MDANSE
...
...
BuildServer/Windows/run_deploy.sh
View file @
dc471047
...
...
@@ -12,10 +12,7 @@ else
BUILD_TARGET
=
$1
fi
# Update the __pkginfo__ file with the current commit
COMMIT_ID
=
$(
git rev-parse
--long
HEAD
)
sed
-i
's/.*__commit__.*/__commit__ = \"${COMMIT_ID}\"/'
MDANSE/__pkginfo__.py
VERSION_NAME
=
`
sed
-n
's/__version__.*=.*\"\(.*\)\"/\1/p'
MDANSE/__pkginfo__.py
`
if
[[
${
CI_BUILD_REF_NAME
}
=
~ develop
]]
...
...
@@ -24,7 +21,7 @@ then
then
VERSION_NAME
=
${
VERSION_NAME
}
-
"weekly-"
`
date
+%Y-%m-%d
`
fi
VERSION_NAME
=
${
VERSION_NAME
}
-
`
git rev-parse
--short
HEAD
`
VERSION_NAME
=
${
VERSION_NAME
}
-
${
COMMIT_ID
}
fi
...
...
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