commit b7baca00304ff551f18cb82082566872f851518e
author Luca Milanesio <luca.milanesio@gmail.com> Mon Nov 21 12:19:07 2022 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Mon Nov 21 12:21:26 2022 +0000
tree e66ed8ef7065e3a7bfcddc8369713c8cfea9a47a
parent e86c469b214f3acf74107699f532e67561cad051
parent fefca7fd9986667db8d92b08db746e0d0eab6f76

Merge branch 'stable-3.6'

* stable-3.6:
  Support Java 11 or 17 as pre-requisite
  Add ARM64 platform in the Debian packages
  Parametrise VENDOR_USER for specifying the GPG key owner
  Add sudo dependency
  Download plugins from archive-ci
  Re-release Gerrit v3.4.8
  Require Java 11 or later
  Set Gerrit to 3.6.3
  Set Gerrit to 3.5.4
  Set Gerrit to 3.4.8
  Set Gerrit to 3.4.7
  Set Gerrit to 3.6.2
  Set Gerrit to 3.5.3
  Set Gerrit to 3.4.6

Change-Id: Ie7f54aef71cba1fb1780054cd5e2c2616bdd132f

fpm/Makefile

diff --git a/fpm/Makefile b/fpm/Makefile
index 515b89e..b689dff 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,6 +1,6 @@
-VERSION=3.6.3
-WAR_VERSION=3.6.3
-BRANCH=stable-3.6
+VERSION=3.7.0
+WAR_VERSION=3.7.0
+BRANCH=stable-3.7
 URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
 CI_URL=https://gerrit-ci.gerritforge.com
 RELEASE=2
@@ -37,7 +37,7 @@
 BUILD_SCRIPTS=$(foreach script,$(SCRIPTS),$(SCRIPTS_ROOT)/$(script))
 
 FPM_OPTS=-s dir \
-	-f -n $(NAME) -v $(VERSION) --iteration $(RELEASE) --category $(CATEGORY) -a $(BUILD_ARCH) \
+	-f -n $(NAME) -v $(VERSION) --iteration $(RELEASE) --category $(CATEGORY) -a all --rpm-os linux \
 	--description "$(SUMMARY)" --url $(WEB_URL) --license "$(LICENSE)" --vendor "$(VENDOR)" \
 	--depends git --depends sudo \
 	--PKG-user $(USER) --PKG-group $(GROUP) \

macOS/Makefile

diff --git a/macOS/Makefile b/macOS/Makefile
index 8df6e92..d9c2930 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 3.6.3
+VERSION := 3.7.0
 
 all: server
 

yum-repo/Makefile

diff --git a/yum-repo/Makefile b/yum-repo/Makefile
index 806d0c1..a598511 100644
--- a/yum-repo/Makefile
+++ b/yum-repo/Makefile
@@ -2,7 +2,7 @@
 # to produce a yum.repo for a VENDOR distribution
 # Default values are pointing to GerritForge (www.gerritforge.com)
 VERSION=1
-RELEASE=3
+RELEASE=4
 VENDOR=GerritForge
 VENDOR_LC=$(shell echo $(VENDOR) | tr A-Z a-z)
 VENDOR_USER=yum
@@ -46,7 +46,7 @@
 
 $(RPM_OUT): $(SRCS) prepare
 	fpm -t rpm -p $@ -s dir \
-	-f -n $(NAME) -v $(VERSION) --iteration $(RELEASE) --category $(CATEGORY) \
+	-f -n $(NAME) -v $(VERSION) --iteration $(RELEASE) --category $(CATEGORY) -a all --rpm-os linux \
 	--description "$(SUMMARY)" --url $(WEB_URL) --license "$(LICENSE)" --vendor "$(VENDOR)" \
 	--rpm-user root --rpm-group root \
 	--verbose etc