From ca9dd9b21e19cf10da3cf53af9df9b51a85fe981 Mon Sep 17 00:00:00 2001 From: York Wong <97939737+nixff@users.noreply.github.com> Date: Wed, 3 Jul 2024 18:52:14 +0800 Subject: [PATCH] [ci] update rpm build for centos7 --- build.sh | 4 ++++ rpm/Dockerfile | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index ed4e7af2e..6a303ceab 100755 --- a/build.sh +++ b/build.sh @@ -234,6 +234,10 @@ if $BUILD_RPM; then cat $__CHANGELOG >> pipy.spec rm -f $__CHANGELOG + if [[ "$RELEASE_VERSION" != "nightly"* ]]; then + REVISION=1 + fi + sudo docker build -t pipy-rpmbuild:$RELEASE_VERSION \ --build-arg VERSION=$VERSION \ --build-arg REVISION=$REVISION \ diff --git a/rpm/Dockerfile b/rpm/Dockerfile index 3dc885326..e87e1879f 100644 --- a/rpm/Dockerfile +++ b/rpm/Dockerfile @@ -5,7 +5,7 @@ ARG VERSION ENV VERSION=${VERSION:-latest} ARG REVISION -ENV REVISION=${REVISION:-0} +ENV REVISION=${REVISION:-1} ARG COMMIT_ID ENV CI_COMMIT_SHA=${COMMIT_ID} @@ -30,10 +30,12 @@ COPY rpmmacros /rpmmacros COPY pipy.tar.gz /pipy.tar.gz COPY pipy.spec /pipy.spec -RUN yum install -y -q unzip rpm-build rpmdevtools \ +RUN sed -i -e 's@^mirrorlist@#mirrorlist@g' -e 's@^# *baseurl=http://mirror@baseurl=http://vault@g' /etc/yum.repos.d/*.repo \ + && yum install -y -q unzip rpm-build rpmdevtools \ && rpmdev-setuptree \ && mv /rpmmacros ~/.rpmmacros \ && yum install -y centos-release-scl epel-release yum-utils \ + && sed -i -e 's@^mirrorlist@#mirrorlist@g' -e 's@^# *baseurl=http://mirror@baseurl=http://vault@g' /etc/yum.repos.d/*.repo \ && yum-builddep --define "_with_gui 1" -y /pipy.spec RUN mv /pipy.tar.gz ~/rpmbuild/SOURCES \