Skip to content

Commit

Permalink
Added option for the reva-plugins repo and include its commit to chan…
Browse files Browse the repository at this point in the history
…gelog
  • Loading branch information
glpatcern committed Nov 4, 2024
1 parent c8bd2e5 commit 14f7451
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ on:
description: 'Branch to be built'
required: true
default: 'master'
plugins:
description: 'Plugins branch to be built'
required: true
default: 'master'
go-version:
description: 'Go version'
required: true
Expand Down Expand Up @@ -46,14 +50,22 @@ jobs:
repository: ${{ inputs.repo }}/reva
path: reva
ref: ${{ inputs.branch }}
- name: Checkout plugins repository
uses: actions/checkout@v3
with:
repository: cernbox/reva-plugins
path: reva-plugins
ref: ${{ inputs.plugins }}
- name: Prepare files for building the RPMs
id: reva-rpms
run: |
set -x
export GOPATH=$(pwd)/go
export PATH=$PATH:$GOPATH/bin
cd reva
echo revaVer="Reva commit $(git rev-parse --short HEAD) at ${{ inputs.repo }}/${{ inputs.branch }}" >> "$GITHUB_OUTPUT"
cd reva-plugins
rpcommit=$(git rev-parse --short HEAD)
cd ../reva
echo revaVer="commit $(git rev-parse --short HEAD) at ${{ inputs.repo }}/reva/${{ inputs.branch }} and commit ${rpcommit} at cernbox/reva-plugins/${{ inputs.plugins }}" >> "$GITHUB_OUTPUT"
cd ../reva-release
go run prepare_release.go -author "temporary" -email "cernbox-admins@cern.ch" -reva-version "Reva commit"
echo "version=$(awk '$1 == "Version:" {print $2}' cernbox-revad.spec)" >> $GITHUB_ENV
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ clean:
gaia:
go install github.com/cs3org/gaia@latest

dist: clean gaia
dist: clean gaia
make reva
gaia build --with github.com/cernbox/reva-plugins --with github.com/cs3org/reva=$(shell pwd) -o ./cmd/revad/revad
gaia build --with github.com/cernbox/reva-plugins --with github.com/cs3org/reva=$(shell pwd) -o ./cmd/revad/revad-ceph --tags ceph
gaia build --with github.com/cernbox/reva-plugins=$(shell pwd)-plugins --with github.com/cs3org/reva=$(shell pwd) -o ./cmd/revad/revad --debug
gaia build --with github.com/cernbox/reva-plugins=$(shell pwd)-plugins --with github.com/cs3org/reva=$(shell pwd) -o ./cmd/revad/revad-ceph --tags ceph --debug
@mkdir -p $(PACKAGE)-$(VERSION)
cp -r cmd/revad/revad cmd/revad/revad-ceph cmd/reva/reva $(PACKAGE)-$(VERSION)
tar cpfz ./$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
Expand Down

0 comments on commit 14f7451

Please sign in to comment.