Skip to content

Commit

Permalink
Bump to version 1.2 (#203)
Browse files Browse the repository at this point in the history
* Bump to version 1.2

Bump OpenSearch and OpenSearch Dashboards plugins to 1.2

Related issue:
opensearch-project/reporting#167

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>

* Use maven for building reports scheduler

Signed-off-by: Joshua Li <joshuali925@gmail.com>

Co-authored-by: Joshua Li <joshuali925@gmail.com>
  • Loading branch information
kavilla and joshuali925 committed Nov 4, 2021
1 parent db23db3 commit f25f0aa
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 43 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on: [pull_request, push]
env:
PLUGIN_NAME: reportsDashboards
ARTIFACT_NAME: reports-dashboards
OPENSEARCH_VERSION: '1.1'
OPENSEARCH_PLUGIN_VERSION: 1.1.0.0
OPENSEARCH_VERSION: '1.2'
OPENSEARCH_PLUGIN_VERSION: 1.2.0.0

jobs:
build:
Expand Down
38 changes: 1 addition & 37 deletions .github/workflows/reports-scheduler-test-and-build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ name: Test and Build Reports Scheduler
on: [push, pull_request]

env:
OPENSEARCH_VERSION: '1.1.0-SNAPSHOT'
OPENSEARCH_BRANCH: '1.1'
COMMON_UTILS_BRANCH: 'main'
JOB_SCHEDULER_BRANCH: 'main'
OPENSEARCH_VERSION: '1.2.0-SNAPSHOT'

jobs:
build:
Expand All @@ -18,39 +15,6 @@ jobs:
with:
java-version: 1.14

# dependencies: OpenSearch
- name: Checkout OpenSearch
uses: actions/checkout@v2
with:
repository: 'opensearch-project/OpenSearch'
path: OpenSearch
ref: ${{ env.OPENSEARCH_BRANCH }}
- name: Build OpenSearch
working-directory: ./OpenSearch
run: ./gradlew publishToMavenLocal

# dependencies: common-utils
- name: Checkout common-utils
uses: actions/checkout@v2
with:
repository: 'opensearch-project/common-utils'
path: common-utils
ref: ${{ env.COMMON_UTILS_BRANCH }}
- name: Build common-utils
working-directory: ./common-utils
run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}

# dependencies: job-scheduler
- name: Checkout job-scheduler
uses: actions/checkout@v2
with:
repository: 'opensearch-project/job-scheduler'
ref: ${{ env.JOB_SCHEDULER_BRANCH }}
path: job-scheduler
- name: Build job-scheduler
working-directory: ./job-scheduler
run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}

# reports-scheduler
- name: Checkout Reports Scheduler
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions opensearch_dashboards.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "reportsDashboards",
"version": "1.1.0.0",
"opensearchDashboardsVersion": "1.1.0",
"version": "1.2.0.0",
"opensearchDashboardsVersion": "1.2.0",
"requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"],
"optionalPlugins": ["share"],
"server": true,
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "reports-dashboards",
"version": "1.1.0.0",
"version": "1.2.0.0",
"description": "OpenSearch Dashboards Reports Plugin",
"license": "Apache-2.0",
"main": "index.ts",
"opensearchDashboards": {
"version": "1.1.0",
"version": "1.2.0",
"templateVersion": "1.0.0"
},
"scripts": {
Expand Down

0 comments on commit f25f0aa

Please sign in to comment.