Skip to content

Commit b2af4e2

Browse files
AlexRuiz7Jorgesnchz
authored andcommitted
Fix build.yml (#5)
* List artifacts folder * Fix revision in Gradle
1 parent 32e5195 commit b2af4e2

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ jobs:
6161
- name: Build with Gradle
6262
run: ./gradlew build -Dversion=${{ steps.version.outputs.version }} -Drevision=${{ inputs.revision }}
6363

64+
- run: ls -la build/distributions
65+
6466
- name: Upload artifact
6567
uses: actions/upload-artifact@v4
6668
with:

build-tools/pkgbuild.gradle

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ apply plugin: 'com.netflix.nebula.ospackage'
99
afterEvaluate {
1010
ospackage {
1111
packageName = "${name}"
12-
release = isSnapshot ? "0.1" : '1'
13-
version = "${project.version}" - "-SNAPSHOT"
12+
version = "${project.version}"
1413

15-
into '/usr/share/opensearch/plugins'
14+
into '/usr/share/wazuh-indexer/plugins'
1615
from(zipTree(bundlePlugin.archivePath)) {
1716
into opensearchplugin.name
1817
}
@@ -23,17 +22,17 @@ afterEvaluate {
2322
dirMode 0755
2423

2524
requires('opensearch-oss', versions.opensearch, EQUAL)
26-
packager = 'Amazon'
27-
vendor = 'Amazon'
25+
packager = 'Wazuh'
26+
vendor = 'Wazuh'
2827
os = 'LINUX'
2928
prefix '/usr'
3029

3130
license 'ASL-2.0'
32-
maintainer 'OpenSearch Team <opensearch@amazon.com>'
33-
url 'https://opensearch.org/downloads.html'
31+
maintainer 'Wazuh Team <info@wazuh.com>'
32+
url 'https://wazuh.com'
3433
summary '''
35-
OpenSearch reports scheduler.
36-
Reference documentation can be found at https://docs-beta.opensearch.org/.
34+
Wazuh Indexer reports scheduler.
35+
Reference documentation can be found at https://opensearch.org/docs/latest/reporting/report-dashboard-index/.
3736
'''.stripIndent().replace('\n', ' ').trim()
3837
}
3938

build.gradle

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,10 @@ buildscript {
1515
opensearch_version = System.getProperty("opensearch.version", "2.19.1-SNAPSHOT")
1616
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
1717
wazuh_version = System.getProperty("version", "5.0.0")
18-
revision = System.getProperty("build.revision", "0")
18+
revision = System.getProperty("revision", "0")
1919
// 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
2020
version_tokens = opensearch_version.tokenize('-')
2121
opensearch_build = version_tokens[0] + '.0'
22-
if (buildVersionQualifier) {
23-
opensearch_build += "-${buildVersionQualifier}"
24-
}
25-
if (isSnapshot) {
26-
opensearch_build += "-SNAPSHOT"
27-
}
2822

2923
common_utils_version = System.getProperty("common_utils.version", opensearch_build)
3024
job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)
@@ -40,7 +34,7 @@ buildscript {
4034
}
4135

4236
dependencies {
43-
classpath "${opensearch_group}.gradle:build-tools:${opensearch_version}"
37+
classpath "org.opensearch.gradle:build-tools:${opensearch_version}"
4438
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
4539
classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}"
4640
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.4"

0 commit comments

Comments
 (0)