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 compilation issue and change names #17

Merged
merged 1 commit into from
Dec 15, 2023
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: 1 addition & 1 deletion .github/workflows/auto-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ jobs:
- uses: ncipollo/release-action@v1
with:
github_token: ${{ steps.github_app_token.outputs.token }}
bodyFile: release-notes/opensearch-agent-tools.release-notes-${{steps.tag.outputs.tag}}.md
bodyFile: release-notes/opensearch-skills.release-notes-${{steps.tag.outputs.tag}}.md
2 changes: 1 addition & 1 deletion .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build-and-publish-snapshots:
strategy:
fail-fast: false
if: github.repository == 'opensearch-project/agent-tools'
if: github.repository == 'opensearch-project/skills'
runs-on: ubuntu-latest

permissions:
Expand Down
25 changes: 17 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ apply plugin: 'opensearch.opensearchplugin'
apply plugin: 'opensearch.testclusters'
apply plugin: 'opensearch.pluginzip'

def sqlJarDirectory = "$buildDir/dependencies/opensearch-sql-plugin"

configurations {
zipArchive
Expand All @@ -69,7 +70,14 @@ configurations {
}
}

def sqlJarDirectory = "$buildDir/dependencies/opensearch-sql-plugin"
task addJarsToClasspath(type: Copy) {
from(fileTree(dir: sqlJarDirectory)) {
include "opensearch-sql-${version}.jar"
include "ppl-${version}.jar"
include "protocol-${version}.jar"
}
into("$buildDir/classes")
}

dependencies {
compileOnly group: 'org.opensearch', name:'opensearch-ml-client', version: "${version}"
Expand All @@ -94,7 +102,8 @@ task extractSqlJar(type: Copy) {
into sqlJarDirectory
}

project.tasks.delombok.dependsOn(extractSqlJar)
tasks.addJarsToClasspath.dependsOn(extractSqlJar)
project.tasks.delombok.dependsOn(addJarsToClasspath)
tasks.publishNebulaPublicationToMavenLocal.dependsOn ':generatePomFileForPluginZipPublication'
tasks.validateNebulaPom.dependsOn ':generatePomFileForPluginZipPublication'

Expand Down Expand Up @@ -133,9 +142,9 @@ compileTestJava {


opensearchplugin {
name 'agent-tools'
description 'OpenSearch Agent Tools'
classname 'org.opensearch.agent_tool.ToolPlugin'
name 'skills'
description 'OpenSearch Skills'
classname 'org.opensearch.agent.ToolPlugin'
extendedPlugins = ['opensearch-ml']
licenseFile rootProject.file("LICENSE.txt")
noticeFile rootProject.file("NOTICE")
Expand All @@ -159,8 +168,8 @@ publishing {
publications {
pluginZip(MavenPublication) { publication ->
pom {
name = "OpenSearch Agent Tools"
description = "OpenSearch Agent Tools"
name = "OpenSearch Skills"
description = "OpenSearch Skills"
groupId = "org.opensearch.plugin"
licenses {
license {
Expand All @@ -171,7 +180,7 @@ publishing {
developers {
developer {
name = "OpenSearch"
url = "https://github.com/opensearch-project/agent-tools"
url = "https://github.com/opensearch-project/skills"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions release-notes/create_release_notes.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
import fileinput
import re

link_prefix = "https://github.com/opensearch-project/agent-tools/pull/"
link_prefix = "https://github.com/opensearch-project/skills/pull/"
searchExp = re.compile("([\(\[]).*?([\)\]])")

current_date = raw_input("what day is today (e.g. 2020-06-29): ")
file_path = raw_input("Path to raw note file (e.g., note.md): ")
plugin_name = "agent-tools"
plugin_name = "skills"
plugin_version = raw_input('Plugin version (x.x.x.x): ')

app = 'OpenSearch'
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
* SPDX-License-Identifier: Apache-2.0
*/

rootProject.name = 'agent-tools'
rootProject.name = 'skills'
Loading