Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
git
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Devtools
git
Merge requests
!1
2.38.1
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
2.38.1
2.38.1
into
main
Overview
0
Commits
4
Pipelines
0
Changes
3
Merged
Patrick MADELA
requested to merge
2.38.1
into
main
2 years ago
Overview
0
Commits
4
Pipelines
0
Changes
3
0
0
Merge request reports
Compare
main
main (base)
and
latest version
latest version
585652bb
4 commits,
2 years ago
3 files
+
129
−
92
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
.gitlab-ci.yml
+
51
−
80
View file @ 585652bb
Edit in single-file editor
Open in Web IDE
Show full file
variables
:
GIT_VERSION
:
"
2.36.2"
GIT_VERSION
:
"
2.38.1"
PYTHON_VERSION
:
"
3.10.8"
DEFAULT_HELP_FORMAT
:
"
man"
stages
:
@@ -8,17 +9,28 @@ stages:
-
test
-
package
workflow
:
rules
:
-
if
:
$CI_PIPELINE_SOURCE == "schedule"
-
if
:
$CI_PIPELINE_SOURCE == "web"
-
if
:
$CI_COMMIT_TAG
.build
:
stage
:
build
script
:
-
yum -y install curl-devel expat-devel gettext-devel openssl-devel zlib-devel perl-ExtUtils-MakeMaker
-
git clone https://github.com/git/git.git
-
cd git
-
git checkout v${GIT_VERSION}
-
autoconf
-
./configure --prefix=${CI_PROJECT_DIR}/${NAME}
-
make NO_INSTALL_HARDLINKS=YesPlease
-
make NO_INSTALL_HARDLINKS=YesPlease install
# Install recent version of python required to build meson that is a requirement for building chain of git
-
curl -s -L -o python.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/${PYTHON_VERSION}/download?job=${PLATFORM}
-
unzip -q python.zip
-
rm python.zip
-
export PATH=$(readlink -e .)/python-${PYTHON_VERSION}-${PLATFORM}/bin:${PATH}
-
python --version | grep ${PYTHON_VERSION}
-
sudo python -m pip install --upgrade pip
-
sudo python -m pip install --upgrade conan
# Build git with conan
-
conan config init
-
conan profile update settings.compiler.libcxx=libstdc++11 default
-
conan create . git/${GIT_VERSION}@soleil/stable --build -c tools.system.package_manager:mode=install -c tools.system.package_manager:tool=yum -c tools.system.package_manager:sudo=True
-
conan install git/${GIT_VERSION}@soleil/stable --install-folder ${CI_PROJECT_DIR}/${NAME}
artifacts
:
name
:
${NAME}
paths
:
@@ -36,95 +48,54 @@ stages:
-
zip -r --symlinks ../${NAME}.zip *
-
'
curl
--header
"JOB-TOKEN:
$CI_JOB_TOKEN"
--upload-file
../${NAME}.zip
"${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/git/${GIT_VERSION}/"'
linux-el6-x86_64
:
extends
:
[
"
.build"
]
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
variables
:
NAME
:
"
git-${GIT_VERSION}-linux-el6-x86_64"
test-el6-x86_64
:
extends
:
[
"
.test"
]
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
variables
:
NAME
:
"
git-${GIT_VERSION}-linux-el6-x86_64"
needs
:
-
linux-el6-x86_64
package-el6-x86_64
:
extends
:
[
"
.package"
]
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
variables
:
NAME
:
"
git-${GIT_VERSION}-linux-el6-x86_64"
needs
:
-
linux-el6-x86_64
-
test-el6-x86_64
linux-el6-i686
:
extends
:
[
"
.build"
]
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
variables
:
NAME
:
"
git-${GIT_VERSION}-linux-el6-i686"
test-el6-i686
:
extends
:
[
"
.test"
]
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
variables
:
NAME
:
"
git-${GIT_VERSION}-linux-el6-i686"
needs
:
-
linux-el6-i686
package-el6-i686
:
extends
:
[
"
.package"
]
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
variables
:
NAME
:
"
git-${GIT_VERSION}-linux-el6-i686"
needs
:
-
linux-el6-i686
-
test-el6-i686
linux-el7-x86_64
:
linux-x86_64
:
extends
:
[
"
.build"
]
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/
dev
-docker-tools/
dev
-el
7
-gcc
48
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/
conan
-docker-tools/
conan
-el
6
-gcc
91
variables
:
NAME
:
"
git-${GIT_VERSION}-linux-el7-x86_64"
PLATFORM
:
linux-x86_64
NAME
:
"
git-${GIT_VERSION}-${PLATFORM}"
test-
el7-
x86_64
:
test-x86_64
:
extends
:
[
"
.test"
]
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/
dev
-docker-tools/
dev
-el
7
-gcc
48
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/
conan
-docker-tools/
conan
-el
6
-gcc
91
variables
:
NAME
:
"
git-${GIT_VERSION}-linux-el7-x86_64"
PLATFORM
:
linux-x86_64
NAME
:
"
git-${GIT_VERSION}-${PLATFORM}"
needs
:
-
linux-
el7-
x86_64
-
linux-x86_64
package-
el7-
x86_64
:
package-x86_64
:
extends
:
[
"
.package"
]
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/
dev
-docker-tools/
dev
-el6-gcc
44-x86
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/
conan
-docker-tools/
conan
-el6-gcc
91
variables
:
NAME
:
"
git-${GIT_VERSION}-linux-el7-x86_64"
PLATFORM
:
linux-x86_64
NAME
:
"
git-${GIT_VERSION}-${PLATFORM}"
needs
:
-
linux-
el7-
x86_64
-
test-
el7-
x86_64
-
linux-x86_64
-
test-x86_64
linux-
el7-
i686
:
linux-i686
:
extends
:
[
"
.build"
]
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/
dev
-docker-tools/
dev
-el
7
-gcc
48
-x86
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/
conan
-docker-tools/
conan
-el
6
-gcc
91
-x86
variables
:
NAME
:
"
git-${GIT_VERSION}-
linux-
el7-
i686
"
GIT_ROOT
:
"
${CI_PROJECT_DIR}/${NAME
}"
PLATFORM
:
linux-i686
NAME
:
"
git-${GIT_VERSION}-${PLATFORM
}"
test-
el7-
i686
:
test-i686
:
extends
:
[
"
.test"
]
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/
dev
-docker-tools/
dev
-el
7
-gcc
48
-x86
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/
conan
-docker-tools/
conan
-el
6
-gcc
91
-x86
variables
:
NAME
:
"
git-${GIT_VERSION}-linux-el7-i686"
PLATFORM
:
linux-i686
NAME
:
"
git-${GIT_VERSION}-${PLATFORM}"
needs
:
-
linux-
el7-
i686
-
linux-i686
package-
el7-
i686
:
package-i686
:
extends
:
[
"
.package"
]
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/
dev
-docker-tools/
dev
-el
7
-gcc
48
-x86
image
:
gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/
conan
-docker-tools/
conan
-el
6
-gcc
91
-x86
variables
:
NAME
:
"
git-${GIT_VERSION}-linux-el7-i686"
PLATFORM
:
linux-i686
NAME
:
"
git-${GIT_VERSION}-${PLATFORM}"
needs
:
-
linux-
el7-
i686
-
test-
el7-
i686
-
linux-i686
-
test-i686
Loading