From 6b6bf9202ec1c0fec6567078fc6e6b3c391a2392 Mon Sep 17 00:00:00 2001 From: Giuseppe Lo Presti Date: Mon, 3 Jun 2024 11:19:52 +0200 Subject: [PATCH] CI: prepare spec file only in the last stage --- .github/workflows/release.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47d1d9c..40fbb31 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,16 +48,6 @@ jobs: repository: ${{ inputs.repo }}/reva path: reva ref: ${{ inputs.branch }} - - name: Bump version in spec file - run: | - export GOPATH=$(pwd)/go - export PATH=$PATH:$GOPATH/bin - cd reva - export REVAVER="Reva commit $(git rev-parse --short HEAD) at ${{ inputs.repo }}/${{ inputs.branch }}" - cd ../reva-release - go run prepare_release.go -author "cernbox-admins[bot]" -email "cernbox-admins@cern.ch" -reva-version "$REVAVER" - echo "version=$(awk '$1 == "Version:" {print $2}' cernbox-revad.spec)" >> $GITHUB_ENV - echo "Reva version is "\""$REVAVER"\" - name: Copy necessary files for building the RPMs run: | cp reva-release/Makefile reva/Makefile.rpm @@ -72,6 +62,7 @@ jobs: make -f Makefile.rpm rpm mkdir /release mv cernbox-*.rpm /release + echo "REVAVER=Reva commit $(git rev-parse --short HEAD) at ${{ inputs.repo }}/${{ inputs.branch }}" >> $GITHUB_ENV env: CGO_ENABLED: 1 CONTAINER: ${{ matrix.container }} @@ -97,8 +88,9 @@ jobs: run: | export GOPATH=$(pwd)/go export PATH=$PATH:$GOPATH/bin + echo "Reva version was '${{ env.REVAVER }}'" cd reva-release - go run prepare_release.go -author "cernbox-admins[bot]" -email "cernbox-admins@cern.ch" + go run prepare_release.go -author "cernbox-admins[bot]" -email "cernbox-admins@cern.ch" -reva-version "${{ env.REVAVER }}" echo "version=$(awk '$1 == "Version:" {print $2}' cernbox-revad.spec)" >> $GITHUB_ENV - name: Push version uses: stefanzweifel/git-auto-commit-action@v4