From dae192df79c4bf25a2e2de9420370b8a91b5d2d1 Mon Sep 17 00:00:00 2001
From: Patrick MADELA <patrick.madela@synchrotron-soleil.fr>
Date: Wed, 5 Oct 2022 15:51:33 +0200
Subject: [PATCH] Clean build and add other platform following succesful build
---
.gitlab-ci.yml | 111 ++++++++++++++++++++++++++++++-------------------
README.md | 8 ++--
2 files changed, 72 insertions(+), 47 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f9fa4f..1b99b32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,10 +19,6 @@ stages:
- ./configure --prefix=${CI_PROJECT_DIR}/${NAME}
- make NO_INSTALL_HARDLINKS=YesPlease
- make NO_INSTALL_HARDLINKS=YesPlease install
- - cd ${CI_PROJECT_DIR}/${NAME}
- - zip -r --symlinks ../${NAME}.zip *
- - cd ${CI_PROJECT_DIR}
- - ls -al
artifacts:
name: ${NAME}
paths:
@@ -38,7 +34,7 @@ stages:
script:
- cd ${CI_PROJECT_DIR}/${NAME}
- 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/fakegit/${GIT_VERSION}/"'
+ - '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"]
@@ -63,41 +59,70 @@ package-el6-x86_64:
- linux-el6-x86_64
- test-el6-x86_64
-# linux-el6-i686:
-# extends: [".build-python"]
-# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
-# variables:
-# NAME: "git-${GIT_VERSION}-${CI_JOB_NAME}"
-# GIT_ROOT: "${CI_PROJECT_DIR}/${NAME}"
-
-# test-el6-i686:
-# extends: [".test-python"]
-# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
-# needs:
-# - linux-el6-i686
-
-# linux-el7-x86_64:
-# extends: [".build-python"]
-# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
-# variables:
-# NAME: "git-${GIT_VERSION}-${CI_JOB_NAME}"
-# GIT_ROOT: "${CI_PROJECT_DIR}/${NAME}"
-
-# test-el7-x86_64:
-# extends: [".test-python"]
-# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
-# needs:
-# - linux-el7-x86_64
-
-# linux-el7-i686:
-# extends: [".build-python"]
-# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
-# variables:
-# NAME: "git-${GIT_VERSION}-${CI_JOB_NAME}"
-# GIT_ROOT: "${CI_PROJECT_DIR}/${NAME}"
-
-# test-el7-i686:
-# extends: [".test-python"]
-# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
-# needs:
-# - linux-el7-i686
+linux-el6-i686:
+ extends: [".build-python"]
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
+ variables:
+ NAME: "git-${GIT_VERSION}-linux-el6-i686"
+
+test-el6-i686:
+ extends: [".test-python"]
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/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-el6-gcc44-x86
+ variables:
+ NAME: "git-${GIT_VERSION}-linux-el6-i686"
+ needs:
+ - linux-el6-i686
+ - test-el6-i686
+
+linux-el7-x86_64:
+ extends: [".build-python"]
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
+ variables:
+ NAME: "git-${GIT_VERSION}-linux-el7-x86_64"
+
+test-el7-x86_64:
+ extends: [".test-python"]
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
+ variables:
+ NAME: "git-${GIT_VERSION}-linux-el7-x86_64"
+ needs:
+ - linux-el7-x86_64
+
+package-el7-x86_64:
+ extends: [".package"]
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
+ variables:
+ NAME: "git-${GIT_VERSION}-linux-el7-x86_64"
+ needs:
+ - linux-el7-x86_64
+ - test-el7-x86_64
+
+linux-el7-i686:
+ extends: [".build-python"]
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
+ variables:
+ NAME: "git-${GIT_VERSION}-${CI_JOB_NAME}"
+ GIT_ROOT: "${CI_PROJECT_DIR}/${NAME}"
+
+test-el7-i686:
+ extends: [".test-python"]
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
+ needs:
+ - linux-el7-i686
+
+package-el7-i686:
+ extends: [".package"]
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
+ variables:
+ NAME: "git-${GIT_VERSION}-linux-el7-i686"
+ needs:
+ - linux-el7-i686
+ - test-el7-i686
\ No newline at end of file
diff --git a/README.md b/README.md
index d9d87ed..2096499 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,10 @@
Pipeline to build Git 2.36.2 for our legacy CentOS platform.
Allows to build Git for:
-* CentOS 6.10 64 bits: [git-2.36.2-linux-el6-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/python3/-/jobs/artifacts/main/download?job=linux-el6-x86_64)
-* CentOS 6.10 32 bits: [git-2.36.2-linux-el6-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/python3/-/jobs/artifacts/main/download?job=linux-el6-i686)
-* CentOS 7.9 64 bits: [git-2.36.2-linux-el7-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/python3/-/jobs/artifacts/main/download?job=linux-el7-x86_64)
-* CentOS 7.9 32 bits: [git-2.36.2-linux-el7-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/python3/-/jobs/artifacts/main/download?job=linux-el7-i686)
+* CentOS 6.10 64 bits: [git-2.36.2-linux-el6-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/git/-/jobs/artifacts/main/download?job=linux-el6-x86_64)
+* CentOS 6.10 32 bits: [git-2.36.2-linux-el6-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/git/-/jobs/artifacts/main/download?job=linux-el6-i686)
+* CentOS 7.9 64 bits: [git-2.36.2-linux-el7-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/git/-/jobs/artifacts/main/download?job=linux-el7-x86_64)
+* CentOS 7.9 32 bits: [git-2.36.2-linux-el7-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/git/-/jobs/artifacts/main/download?job=linux-el7-i686)
Build on Docker image:
* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44
--
GitLab