From 1e1200004f5c8250a283d3ce2f99d1ab0cab41cc Mon Sep 17 00:00:00 2001
From: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>
Date: Mon, 4 Nov 2024 11:53:30 +0100
Subject: [PATCH] Added option for the reva-plugins repo and include its commit
 to changelog

---
 .github/workflows/release.yml | 16 ++++++++++++++--
 Makefile                      |  6 +++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1a6d94c..975211e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -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
@@ -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
diff --git a/Makefile b/Makefile
index 77e0ee1..c3a8db8 100644
--- a/Makefile
+++ b/Makefile
@@ -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=../reva-plugins --with github.com/cs3org/reva=$(shell pwd) -o ./cmd/revad/revad --debug
+	gaia build --with github.com/cernbox/reva-plugins=../reva-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)