diff --git a/.github/workflows/sql-odbc-release-workflow.yml b/.github/workflows/sql-odbc-release-workflow.yml index 98f3ab4bb1..11d604a1aa 100644 --- a/.github/workflows/sql-odbc-release-workflow.yml +++ b/.github/workflows/sql-odbc-release-workflow.yml @@ -12,7 +12,7 @@ env: ODBC_BUILD_PATH: "./build/odbc/build" AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install" PLUGIN_NAME: opensearch-sql-odbc - OD_VERSION: 2.0.0.0 + OD_VERSION: 1.4.0.0 jobs: build-mac: diff --git a/.github/workflows/sql-odbc-rename-and-release-workflow.yml b/.github/workflows/sql-odbc-rename-and-release-workflow.yml deleted file mode 100644 index 72b2cbe362..0000000000 --- a/.github/workflows/sql-odbc-rename-and-release-workflow.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Rename and release ODBC - -# This workflow will rename previous artifacts of odbc and upload to s3, triggered by tag "rename*" - -on: - push: - tags: - - rename* - -env: - OD_VERSION: 2.0.0.0 - -jobs: - upload-odbc: - runs-on: ubuntu-latest - - name: Upload ODBC to S3 - steps: - - name: Configure AWS CLI - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - - name: Rename and upload for MacOS - run: | - mkdir macos - cd macos - aws s3 cp "s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-clients/opendistro-sql-odbc/mac/OpenSearch SQL ODBC Driver 64-bit-1.11.0.0-Darwin.pkg" "OpenSearch SQL ODBC Driver 64-bit-${{ env.OD_VERSION }}-Darwin.pkg" - mac_installer=`ls -1t *.pkg | grep "OpenSearch SQL ODBC Driver" | head -1` - echo $mac_installer - aws s3 cp "$mac_installer" s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-clients/opendistro-sql-odbc/mac/ - cd .. - - - name: Rename and upload for win32 - run: | - mkdir win32 - cd win32 - aws s3 cp "s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-clients/opendistro-sql-odbc/windows/OpenSearch SQL ODBC Driver 32-bit-1.11.0.0-Windows.msi" "OpenSearch SQL ODBC Driver 32-bit-${{ env.OD_VERSION }}-Windows.msi" - windows_installer=`ls -1t *.msi | grep "OpenSearch SQL ODBC Driver" | head -1` - echo $windows_installer - aws s3 cp "$windows_installer" s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-clients/opendistro-sql-odbc/windows/ - cd .. - - - name: Rename and upload for win64 - run: | - mkdir win64 - cd win64 - aws s3 cp "s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-clients/opendistro-sql-odbc/windows/OpenSearch SQL ODBC Driver 64-bit-1.11.0.0-Windows.msi" "OpenSearch SQL ODBC Driver 64-bit-${{ env.OD_VERSION }}-Windows.msi" - windows_installer=`ls -1t *.msi | grep "OpenSearch SQL ODBC Driver" | head -1` - echo $windows_installer - aws s3 cp "$windows_installer" s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-clients/opendistro-sql-odbc/windows/ - diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt index 7ba1d57e08..e2555ba9e5 100644 --- a/sql-odbc/src/CMakeLists.txt +++ b/sql-odbc/src/CMakeLists.txt @@ -63,8 +63,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 "2.0.0.0") -set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "2,0,0,0") +set(DRIVER_PACKAGE_VERSION "1.4.0.0") +set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,4,0,0") add_compile_definitions( OPENSEARCH_ODBC_VERSION="${DRIVER_PACKAGE_VERSION}" # Comma separated version is required for odbc administrator's driver file. OPENSEARCH_ODBC_DRVFILE_VERSION=${DRIVER_PACKAGE_VERSION_COMMA_SEPARATED} )