Skip to content
Snippets Groups Projects
Commit 5098e78f authored by Francesco Giacomini's avatar Francesco Giacomini
Browse files

Run the CI job directly on CentOS

* Explicitly install build-time deps needed for this package
* Take the httpg patch from this repo
parent 166a886c
No related branches found
No related tags found
1 merge request!18Rebase to openresty 1.19.9.1
Pipeline #63157 passed
image: ${CI_REGISTRY}/storm2/build/ngx-voms-build:issue-17-latest
#image: storm2/ngx-voms-build:latest
stages: stages:
- build - build
...@@ -8,8 +6,11 @@ stages: ...@@ -8,8 +6,11 @@ stages:
build-rpm: build-rpm:
stage: build stage: build
image: centos:7
script: script:
- env | sort - env | sort
- sh .devcontainer/assets/install-build-deps.sh
- yum install -y rpm-build redhat-rpm-config rpmdevtools
- cd rpm && sh make_packaging.sh ${CI_PROJECT_DIR} && cd .. - cd rpm && sh make_packaging.sh ${CI_PROJECT_DIR} && cd ..
- mv ${HOME}/rpmbuild ./rpmbuild - mv ${HOME}/rpmbuild ./rpmbuild
artifacts: artifacts:
......
...@@ -10,9 +10,6 @@ if [ ! -d "$voms_module_prefix" ]; then ...@@ -10,9 +10,6 @@ if [ ! -d "$voms_module_prefix" ]; then
exit 1 exit 1
fi fi
# install rpm build tools:
sudo yum install -y rpm-build redhat-rpm-config rpmdevtools
mkdir -p ${HOME}/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} mkdir -p ${HOME}/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
cat <<EOF > ${HOME}/.rpmmacros cat <<EOF > ${HOME}/.rpmmacros
%_topdir %{getenv:HOME}/rpmbuild %_topdir %{getenv:HOME}/rpmbuild
...@@ -21,7 +18,7 @@ EOF ...@@ -21,7 +18,7 @@ EOF
cat ${HOME}/.rpmmacros cat ${HOME}/.rpmmacros
cp ${HOME}/nginx-httpg_no_delegation.patch ${HOME}/rpmbuild/SOURCES/ cp ${voms_module_prefix}/nginx-httpg_no_delegation.patch ${HOME}/rpmbuild/SOURCES/
cp SOURCES/* ${HOME}/rpmbuild/SOURCES/ cp SOURCES/* ${HOME}/rpmbuild/SOURCES/
cp SPECS/*.spec ${HOME}/rpmbuild/SPECS/ cp SPECS/*.spec ${HOME}/rpmbuild/SPECS/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment