Date: Thursday, September 1, 2022 @ 17:14:21
Author: hashworks
Revision: 1290374
archrelease: copy trunk to community-x86_64
Added:
opensearch-alerting-plugin/repos/community-x86_64/PKGBUILD
(from rev 1290373, opensearch-alerting-plugin/trunk/PKGBUILD)
Deleted:
opensearch-alerting-plugin/repos/community-x86_64/0001-Add-support-for-reproducible-builds.patch
opensearch-alerting-plugin/repos/community-x86_64/PKGBUILD
------------------------------------------------+
0001-Add-support-for-reproducible-builds.patch | 34 --------
PKGBUILD | 91 ++++++++++-------------
2 files changed, 42 insertions(+), 83 deletions(-)
Deleted: 0001-Add-support-for-reproducible-builds.patch
===================================================================
--- 0001-Add-support-for-reproducible-builds.patch 2022-09-01 17:14:19 UTC
(rev 1290373)
+++ 0001-Add-support-for-reproducible-builds.patch 2022-09-01 17:14:21 UTC
(rev 1290374)
@@ -1,34 +0,0 @@
-From f40dbfdcee004f078216b00b1ce46744a8664205 Mon Sep 17 00:00:00 2001
-From: Leonidas Spyropoulos <artafi...@gmail.com>
-Date: Tue, 14 Jun 2022 18:00:54 +0100
-Subject: [PATCH] Add support for reproducible builds
-
-As per gradle [docs] add support to remove timestamps and package with same
order which is required from
-[reproducible] builds
-
-[docs]:
https://docs.gradle.org/current/userguide/working_with_files.html#sec:archives
-[reproducible]: https://reproducible-builds.org/
-
-Signed-off-by: Leonidas Spyropoulos <artafi...@archlinux.com>
----
- build.gradle | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/build.gradle b/build.gradle
-index 60b11af..9a898d3 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -88,6 +88,10 @@ allprojects {
- compileKotlin.kotlinOptions.jvmTarget =
compileTestKotlin.kotlinOptions.jvmTarget = JavaVersion.VERSION_11
- compileKotlin.dependsOn ktlint
- }
-+ tasks.withType(AbstractArchiveTask).configureEach {
-+ preserveFileTimestamps = false
-+ reproducibleFileOrder = true
-+ }
- }
-
- evaluationDependsOnChildren()
---
-2.36.1
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-01 17:14:19 UTC (rev 1290373)
+++ PKGBUILD 2022-09-01 17:14:21 UTC (rev 1290374)
@@ -1,49 +0,0 @@
-# Maintainer: Justin Kromlinger <hashwo...@archlinux.org>
-
-pkgname=opensearch-alerting-plugin
-pkgver=2.1.0.0
-pkgrel=1
-_opensearchver=2.1.0
-_jdkver=11
-pkgdesc="OpenSearch Alerting Plugin"
-arch=('x86_64')
-url="https://docs-beta.opensearch.org/monitoring-plugins/alerting";
-license=('Apache')
-depends=("opensearch=${_opensearchver}")
-makedepends=("java-environment=${_jdkver}" 'unzip')
-source=(
-
"${pkgname}-${pkgver}.tar.gz::https://github.com/opensearch-project/alerting/archive/${pkgver}.tar.gz";
- "0001-Add-support-for-reproducible-builds.patch"
-)
-sha256sums=('2885fac111e65bd38dde8fc147a7e018ec897cc2374efeb1d51f864e74768e9f'
- '3bab2d7e8b31b3b1333c072fa91e63e7f6eda8d5ea94f46f0d056de98eb7c228')
-
-prepare() {
- cd "alerting-${pkgver}"
- patch -Np1 -i "$srcdir"/0001-Add-support-for-reproducible-builds.patch
-}
-
-build() {
- cd "alerting-${pkgver}"
- export JAVA_HOME="/usr/lib/jvm/java-${_jdkver}-openjdk"
- export PATH="/usr/lib/jvm/java-${_jdkver}-openjdk/bin:$PATH"
- export GRADLE_OPTS="-Dbuild.snapshot=false
-Dopensearch.version=${_opensearchver}"
- # alertingBwcCluster and integTest (Reaper) requires JDK 14
- ./gradlew build \
- --exclude-task ":alerting:alertingBwcCluster#fullRestartClusterTask" \
- --exclude-task ":alerting:alertingBwcCluster#mixedClusterTask" \
- --exclude-task ":alerting:alertingBwcCluster#oldVersionClusterTask0" \
- --exclude-task ":alerting:alertingBwcCluster#oldVersionClusterTask1" \
- --exclude-task ":alerting:alertingBwcCluster#rollingUpgradeClusterTask" \
- --exclude-task ":alerting:alertingBwcCluster#twoThirdsUpgradedClusterTask"
\
- --exclude-task ":alerting:integTest" \
- --exclude-task ":alerting:jacocoTestReport"
-}
-
-package() {
- install -dm755 "${pkgdir}/usr/share/opensearch/plugins/opensearch-alerting"
- cd "${pkgdir}/usr/share/opensearch/plugins/opensearch-alerting"
- unzip
"${srcdir}/alerting-${pkgver}/alerting/build/distributions/opensearch-alerting-${pkgver}.zip"
-
- install -Dm644 "${srcdir}/alerting-${pkgver}/LICENSE.txt"
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-}
Copied: opensearch-alerting-plugin/repos/community-x86_64/PKGBUILD (from rev
1290373, opensearch-alerting-plugin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-09-01 17:14:21 UTC (rev 1290374)
@@ -0,0 +1,42 @@
+# Maintainer: Justin Kromlinger <hashwo...@archlinux.org>
+
+pkgname=opensearch-alerting-plugin
+pkgver=2.1.0.0
+pkgrel=2
+_opensearchver=2.1.0
+_jdkver=11
+pkgdesc="OpenSearch Alerting Plugin"
+arch=('x86_64')
+url="https://docs-beta.opensearch.org/monitoring-plugins/alerting";
+license=('Apache')
+depends=("opensearch=${_opensearchver}" "opensearch-notifications-plugin")
+makedepends=("java-environment=${_jdkver}" 'unzip')
+source=(
+
"${pkgname}-${pkgver}.tar.gz::https://github.com/opensearch-project/alerting/archive/${pkgver}.tar.gz";
+)
+sha256sums=('2885fac111e65bd38dde8fc147a7e018ec897cc2374efeb1d51f864e74768e9f')
+
+build() {
+ cd "alerting-${pkgver}"
+ export JAVA_HOME="/usr/lib/jvm/java-${_jdkver}-openjdk"
+ export PATH="/usr/lib/jvm/java-${_jdkver}-openjdk/bin:$PATH"
+ export GRADLE_OPTS="-Dbuild.snapshot=false
-Dopensearch.version=${_opensearchver}"
+ # alertingBwcCluster and integTest (Reaper) requires JDK 14
+ ./gradlew build \
+ --exclude-task ":alerting:alertingBwcCluster#fullRestartClusterTask" \
+ --exclude-task ":alerting:alertingBwcCluster#mixedClusterTask" \
+ --exclude-task ":alerting:alertingBwcCluster#oldVersionClusterTask0" \
+ --exclude-task ":alerting:alertingBwcCluster#oldVersionClusterTask1" \
+ --exclude-task ":alerting:alertingBwcCluster#rollingUpgradeClusterTask" \
+ --exclude-task ":alerting:alertingBwcCluster#twoThirdsUpgradedClusterTask"
\
+ --exclude-task ":alerting:integTest" \
+ --exclude-task ":alerting:jacocoTestReport"
+}
+
+package() {
+ install -dm755 "${pkgdir}/usr/share/opensearch/plugins/opensearch-alerting"
+ cd "${pkgdir}/usr/share/opensearch/plugins/opensearch-alerting"
+ unzip
"${srcdir}/alerting-${pkgver}/alerting/build/distributions/opensearch-alerting-${pkgver}.zip"
+
+ install -Dm644 "${srcdir}/alerting-${pkgver}/LICENSE.txt"
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+}
