From c8f099d0c183e603363dcd76ea757de4f2ad07d1 Mon Sep 17 00:00:00 2001 From: David Cui Date: Thu, 4 Feb 2021 13:45:16 -0800 Subject: [PATCH] add more version bumps for workbench and workflows --- .github/workflows/sql-workbench-release-workflow.yml | 6 +++--- .github/workflows/sql-workbench-test-and-build-workflow.yml | 6 +++--- sql-odbc/src/CMakeLists.txt | 4 ++-- workbench/.cypress/integration/ui.spec.js | 2 +- workbench/kibana.json | 4 ++-- workbench/package.json | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/sql-workbench-release-workflow.yml b/.github/workflows/sql-workbench-release-workflow.yml index 4c6ea2732f..785b38bb7c 100644 --- a/.github/workflows/sql-workbench-release-workflow.yml +++ b/.github/workflows/sql-workbench-release-workflow.yml @@ -7,7 +7,7 @@ on: env: PLUGIN_NAME: opendistroQueryWorkbenchKibana - OD_VERSION: 1.12.0.0 + OD_VERSION: 1.13.0.0 jobs: @@ -31,14 +31,14 @@ jobs: uses: actions/checkout@v1 with: repository: opendistro-for-elasticsearch/kibana-oss - ref: 7.10.0 + ref: 7.10.2 token: ${{secrets.OD_ACCESS}} path: sql/kibana - name: Setup Node uses: actions/setup-node@v1 with: - node-version: '10.22.1' + node-version: '10.23.1' - name: Move Workbench to Plugins Dir run: | diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml index 788f00362d..a173605921 100644 --- a/.github/workflows/sql-workbench-test-and-build-workflow.yml +++ b/.github/workflows/sql-workbench-test-and-build-workflow.yml @@ -4,7 +4,7 @@ on: [pull_request, push] env: PLUGIN_NAME: opendistroQueryWorkbenchKibana - OD_VERSION: 1.12.0.0 + OD_VERSION: 1.13.0.0 jobs: @@ -19,12 +19,12 @@ jobs: uses: actions/checkout@v1 with: repository: elastic/kibana - ref: v7.10.0 + ref: v7.10.2 path: sql/kibana - name: Setup Node uses: actions/setup-node@v1 with: - node-version: '10.22.1' + node-version: '10.23.1' - name: Move Workbench to Plugins Dir run: | mv workbench kibana/plugins diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt index 8c0836a89a..97f7fde5d2 100644 --- a/sql-odbc/src/CMakeLists.txt +++ b/sql-odbc/src/CMakeLists.txt @@ -78,8 +78,8 @@ set(INSTALL_SRC "${CMAKE_CURRENT_SOURCE_DIR}/installer") set(DSN_INSTALLER_SRC "${CMAKE_CURRENT_SOURCE_DIR}/DSNInstaller") # ODBC Driver version -set(DRIVER_PACKAGE_VERSION "1.12.0.0") -set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,12,0,0") +set(DRIVER_PACKAGE_VERSION "1.13.0.0") +set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,13,0,0") add_compile_definitions( ES_ODBC_VERSION="${DRIVER_PACKAGE_VERSION}" # Comma separated version is required for odbc administrator's driver file. ES_ODBC_DRVFILE_VERSION=${DRIVER_PACKAGE_VERSION_COMMA_SEPARATED} ) diff --git a/workbench/.cypress/integration/ui.spec.js b/workbench/.cypress/integration/ui.spec.js index a61b1f2ef9..11f03c8598 100644 --- a/workbench/.cypress/integration/ui.spec.js +++ b/workbench/.cypress/integration/ui.spec.js @@ -169,7 +169,7 @@ describe('Test and verify SQL downloads', () => { url: url, headers: { 'content-type': 'application/json;charset=UTF-8', - 'kbn-version': '7.10.0', + 'kbn-version': '7.10.2', }, body: { 'query': 'select * from accounts where balance > 49500' diff --git a/workbench/kibana.json b/workbench/kibana.json index b288785840..4b8867030c 100644 --- a/workbench/kibana.json +++ b/workbench/kibana.json @@ -1,7 +1,7 @@ { "id": "opendistroQueryWorkbenchKibana", - "version": "1.12.0.0", - "kibanaVersion": "7.10.0", + "version": "1.13.0.0", + "kibanaVersion": "7.10.2", "server": true, "ui": true, "requiredPlugins": ["navigation"], diff --git a/workbench/package.json b/workbench/package.json index cc9b9f495a..f78cd6ab6b 100644 --- a/workbench/package.json +++ b/workbench/package.json @@ -1,12 +1,12 @@ { "name": "opendistro-query-workbench", - "version": "1.12.0.0", + "version": "1.13.0.0", "description": "Query Workbench", "main": "index.js", "license": "Apache-2.0", "homepage": "https://github.com/opendistro-for-elasticsearch/sql/tree/master/workbench", "kibana": { - "version": "7.10.0", + "version": "7.10.2", "templateVersion": "6.3.3" }, "repository": { @@ -46,7 +46,7 @@ "tslint-plugin-prettier": "^2.0.1" }, "engines": { - "node": "10.22.1", + "node": "10.23.1", "yarn": "^1.21.1" }, "resolutions": {