Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build.yml #5

Merged
merged 2 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ jobs:
- name: Build with Gradle
run: ./gradlew build -Dversion=${{ steps.version.outputs.version }} -Drevision=${{ inputs.revision }}

- run: ls -la build/distributions

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
Expand Down
17 changes: 8 additions & 9 deletions build-tools/pkgbuild.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ apply plugin: 'com.netflix.nebula.ospackage'
afterEvaluate {
ospackage {
packageName = "${name}"
release = isSnapshot ? "0.1" : '1'
version = "${project.version}" - "-SNAPSHOT"
version = "${project.version}"

into '/usr/share/opensearch/plugins'
into '/usr/share/wazuh-indexer/plugins'
from(zipTree(bundlePlugin.archivePath)) {
into opensearchplugin.name
}
Expand All @@ -23,17 +22,17 @@ afterEvaluate {
dirMode 0755

requires('opensearch-oss', versions.opensearch, EQUAL)
packager = 'Amazon'
vendor = 'Amazon'
packager = 'Wazuh'
vendor = 'Wazuh'
os = 'LINUX'
prefix '/usr'

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

Expand Down
14 changes: 2 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,12 @@ import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask

buildscript {
ext {
opensearch_group = "org.opensearch"

isSnapshot = "true" == System.getProperty("build.snapshot", "false")
opensearch_version = System.getProperty("opensearch.version", "2.16.0-SNAPSHOT")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
wazuh_version = System.getProperty("version", "5.0.0")
revision = System.getProperty("build.revision", "0")
revision = System.getProperty("revision", "0")
// 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
version_tokens = opensearch_version.tokenize('-')
opensearch_build = version_tokens[0] + '.0'
if (buildVersionQualifier) {
opensearch_build += "-${buildVersionQualifier}"
}
if (isSnapshot) {
opensearch_build += "-SNAPSHOT"
}

common_utils_version = System.getProperty("common_utils.version", opensearch_build)
job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)
Expand All @@ -40,7 +30,7 @@ buildscript {
}

dependencies {
classpath "${opensearch_group}.gradle:build-tools:${opensearch_version}"
classpath "org.opensearch.gradle:build-tools:${opensearch_version}"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.4"
Expand Down
Loading