From dc717556d11e52001d4ef50d67aef38f55971a1f Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 11 Oct 2022 14:54:24 -0400 Subject: [PATCH 01/22] initial commit to enable windows and macos build Signed-off-by: Derek Ho --- .../dashboards-reports-release-workflow.yml | 210 +++++++++++++++++- 1 file changed, 209 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dashboards-reports-release-workflow.yml b/.github/workflows/dashboards-reports-release-workflow.yml index bceefb9d..aebef897 100644 --- a/.github/workflows/dashboards-reports-release-workflow.yml +++ b/.github/workflows/dashboards-reports-release-workflow.yml @@ -12,7 +12,7 @@ env: OPENSEARCH_PLUGIN_VERSION: 1.0.0.0 jobs: - build: + linux-build: runs-on: ubuntu-latest steps: @@ -113,3 +113,211 @@ jobs: windows_x64_artifact_outfile=`basename ${windows_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` echo "Copying $windows_x64_artifact to ${s3_prefix}${windows_x64_artifact_outfile}" aws s3 cp --quiet $windows_x64_artifact ${s3_prefix}${windows_x64_artifact_outfile} + + windows-build: + runs-on: windows-latest + + steps: + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_STAGING_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_STAGING_SECRET_ACCESS_KEY }} + aws-region: us-east-1 + + # Enable longer filenames for windows + - name: Enable longer filenames + run: git config --system core.longpaths true + - name: Checkout Plugin + uses: actions/checkout@v1 + + - name: Checkout OpenSearch Dashboards + uses: actions/checkout@v1 + with: + repository: opensearch-project/Opensearch-Dashboards + ref: ${{ env.OPENSEARCH_VERSION }} + path: dashboards-reports/OpenSearch-Dashboards + + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: "10.24.1" + + - name: Move Dashboards Reports to Plugins Dir + run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + + - name: Add Chromium Binary to Reporting for Testing + run: | + sudo apt install -y libnss3-dev fonts-liberation libfontconfig1 + cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip + unzip chromium-windows-x64.zip + rm chromium-windows-x64.zip + + - name: OpenSearch Dashboards Plugin Bootstrap + uses: nick-invision/retry@v1 + with: + timeout_minutes: 30 + max_attempts: 3 + command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn osd bootstrap + + - name: Test + uses: nick-invision/retry@v1 + with: + timeout_minutes: 30 + max_attempts: 3 + command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn test + + - name: Build Artifact and upload to S3 + run: | + cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + yarn build + + cd build + mkdir -p ./{linux-x64,linux-arm64,windows-x64}/OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip + mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip + + s3_prefix="s3://staging.artifacts.opendistroforelasticsearch.amazon.com/snapshots/kibana-plugins/reports/" + + cd linux-x64 + wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip + unzip chromium-linux-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} + rm chromium-linux-x64.zip + zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./OpenSearch-Dashboards + linux_x64_artifact=`ls ./${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip` + + #Inject build number before the suffix and upload to S3 + linux_x64_artifact_outfile=`basename ${linux_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` + echo "Copying $linux_x64_artifact to ${s3_prefix}${linux_x64_artifact_outfile}" + aws s3 cp --quiet $linux_x64_artifact ${s3_prefix}${linux_x64_artifact_outfile} + cd .. + + cd linux-arm64 + wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-arm64.zip + unzip chromium-linux-arm64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} + rm chromium-linux-arm64.zip + zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./OpenSearch-Dashboards + linux_arm64_artifact=`ls ./${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip` + + #Inject build number before the suffix and upload to S3 + linux_arm64_artifact_outfile=`basename ${linux_arm64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` + echo "Copying $linux_arm64_artifact to ${s3_prefix}${linux_arm64_artifact_outfile}" + aws s3 cp --quiet $linux_arm64_artifact ${s3_prefix}${linux_arm64_artifact_outfile} + cd .. + + cd windows-x64 + wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip + unzip chromium-windows-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} + rm chromium-windows-x64.zip + zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./OpenSearch-Dashboards + windows_x64_artifact=`ls ./${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip` + + #Inject build number before the suffix and upload to S3 + windows_x64_artifact_outfile=`basename ${windows_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` + echo "Copying $windows_x64_artifact to ${s3_prefix}${windows_x64_artifact_outfile}" + aws s3 cp --quiet $windows_x64_artifact ${s3_prefix}${windows_x64_artifact_outfile} + + linux-build: + runs-on: ubuntu-latest + + steps: + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_STAGING_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_STAGING_SECRET_ACCESS_KEY }} + aws-region: us-east-1 + + - name: Checkout Plugin + uses: actions/checkout@v1 + + - name: Checkout OpenSearch Dashboards + uses: actions/checkout@v1 + with: + repository: opensearch-project/Opensearch-Dashboards + ref: ${{ env.OPENSEARCH_VERSION }} + path: dashboards-reports/OpenSearch-Dashboards + + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: "10.24.1" + + - name: Move Dashboards Reports to Plugins Dir + run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + + - name: Add Chromium Binary to Reporting for Testing + run: | + sudo apt install -y libnss3-dev fonts-liberation libfontconfig1 + cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip + unzip chromium-linux-x64.zip + rm chromium-linux-x64.zip + + - name: OpenSearch Dashboards Plugin Bootstrap + uses: nick-invision/retry@v1 + with: + timeout_minutes: 30 + max_attempts: 3 + command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn osd bootstrap + + - name: Test + uses: nick-invision/retry@v1 + with: + timeout_minutes: 30 + max_attempts: 3 + command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn test + + - name: Build Artifact and upload to S3 + run: | + cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + yarn build + + cd build + mkdir -p ./{linux-x64,linux-arm64,windows-x64}/OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip + mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip + + s3_prefix="s3://staging.artifacts.opendistroforelasticsearch.amazon.com/snapshots/kibana-plugins/reports/" + + cd linux-x64 + wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip + unzip chromium-linux-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} + rm chromium-linux-x64.zip + zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./OpenSearch-Dashboards + linux_x64_artifact=`ls ./${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip` + + #Inject build number before the suffix and upload to S3 + linux_x64_artifact_outfile=`basename ${linux_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` + echo "Copying $linux_x64_artifact to ${s3_prefix}${linux_x64_artifact_outfile}" + aws s3 cp --quiet $linux_x64_artifact ${s3_prefix}${linux_x64_artifact_outfile} + cd .. + + cd linux-arm64 + wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-arm64.zip + unzip chromium-linux-arm64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} + rm chromium-linux-arm64.zip + zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./OpenSearch-Dashboards + linux_arm64_artifact=`ls ./${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip` + + #Inject build number before the suffix and upload to S3 + linux_arm64_artifact_outfile=`basename ${linux_arm64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` + echo "Copying $linux_arm64_artifact to ${s3_prefix}${linux_arm64_artifact_outfile}" + aws s3 cp --quiet $linux_arm64_artifact ${s3_prefix}${linux_arm64_artifact_outfile} + cd .. + + cd windows-x64 + wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip + unzip chromium-windows-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} + rm chromium-windows-x64.zip + zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./OpenSearch-Dashboards + windows_x64_artifact=`ls ./${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip` + + #Inject build number before the suffix and upload to S3 + windows_x64_artifact_outfile=`basename ${windows_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` + echo "Copying $windows_x64_artifact to ${s3_prefix}${windows_x64_artifact_outfile}" + aws s3 cp --quiet $windows_x64_artifact ${s3_prefix}${windows_x64_artifact_outfile} + From 670f703cf062b05bf2e97007332abaaacf423ee0 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 11 Oct 2022 15:12:45 -0400 Subject: [PATCH 02/22] add windows and macos builds Signed-off-by: Derek Ho --- .../dashboards-reports-release-workflow.yml | 210 +----------------- ...boards-reports-test-and-build-workflow.yml | 158 ++++++++++++- 2 files changed, 148 insertions(+), 220 deletions(-) diff --git a/.github/workflows/dashboards-reports-release-workflow.yml b/.github/workflows/dashboards-reports-release-workflow.yml index aebef897..bceefb9d 100644 --- a/.github/workflows/dashboards-reports-release-workflow.yml +++ b/.github/workflows/dashboards-reports-release-workflow.yml @@ -12,7 +12,7 @@ env: OPENSEARCH_PLUGIN_VERSION: 1.0.0.0 jobs: - linux-build: + build: runs-on: ubuntu-latest steps: @@ -113,211 +113,3 @@ jobs: windows_x64_artifact_outfile=`basename ${windows_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` echo "Copying $windows_x64_artifact to ${s3_prefix}${windows_x64_artifact_outfile}" aws s3 cp --quiet $windows_x64_artifact ${s3_prefix}${windows_x64_artifact_outfile} - - windows-build: - runs-on: windows-latest - - steps: - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_STAGING_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_STAGING_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - # Enable longer filenames for windows - - name: Enable longer filenames - run: git config --system core.longpaths true - - name: Checkout Plugin - uses: actions/checkout@v1 - - - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v1 - with: - repository: opensearch-project/Opensearch-Dashboards - ref: ${{ env.OPENSEARCH_VERSION }} - path: dashboards-reports/OpenSearch-Dashboards - - - name: Setup Node - uses: actions/setup-node@v1 - with: - node-version: "10.24.1" - - - name: Move Dashboards Reports to Plugins Dir - run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - - - name: Add Chromium Binary to Reporting for Testing - run: | - sudo apt install -y libnss3-dev fonts-liberation libfontconfig1 - cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip - unzip chromium-windows-x64.zip - rm chromium-windows-x64.zip - - - name: OpenSearch Dashboards Plugin Bootstrap - uses: nick-invision/retry@v1 - with: - timeout_minutes: 30 - max_attempts: 3 - command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn osd bootstrap - - - name: Test - uses: nick-invision/retry@v1 - with: - timeout_minutes: 30 - max_attempts: 3 - command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn test - - - name: Build Artifact and upload to S3 - run: | - cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - yarn build - - cd build - mkdir -p ./{linux-x64,linux-arm64,windows-x64}/OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip - cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip - mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip - - s3_prefix="s3://staging.artifacts.opendistroforelasticsearch.amazon.com/snapshots/kibana-plugins/reports/" - - cd linux-x64 - wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip - unzip chromium-linux-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - rm chromium-linux-x64.zip - zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./OpenSearch-Dashboards - linux_x64_artifact=`ls ./${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip` - - #Inject build number before the suffix and upload to S3 - linux_x64_artifact_outfile=`basename ${linux_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` - echo "Copying $linux_x64_artifact to ${s3_prefix}${linux_x64_artifact_outfile}" - aws s3 cp --quiet $linux_x64_artifact ${s3_prefix}${linux_x64_artifact_outfile} - cd .. - - cd linux-arm64 - wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-arm64.zip - unzip chromium-linux-arm64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - rm chromium-linux-arm64.zip - zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./OpenSearch-Dashboards - linux_arm64_artifact=`ls ./${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip` - - #Inject build number before the suffix and upload to S3 - linux_arm64_artifact_outfile=`basename ${linux_arm64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` - echo "Copying $linux_arm64_artifact to ${s3_prefix}${linux_arm64_artifact_outfile}" - aws s3 cp --quiet $linux_arm64_artifact ${s3_prefix}${linux_arm64_artifact_outfile} - cd .. - - cd windows-x64 - wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip - unzip chromium-windows-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - rm chromium-windows-x64.zip - zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./OpenSearch-Dashboards - windows_x64_artifact=`ls ./${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip` - - #Inject build number before the suffix and upload to S3 - windows_x64_artifact_outfile=`basename ${windows_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` - echo "Copying $windows_x64_artifact to ${s3_prefix}${windows_x64_artifact_outfile}" - aws s3 cp --quiet $windows_x64_artifact ${s3_prefix}${windows_x64_artifact_outfile} - - linux-build: - runs-on: ubuntu-latest - - steps: - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_STAGING_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_STAGING_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - - name: Checkout Plugin - uses: actions/checkout@v1 - - - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v1 - with: - repository: opensearch-project/Opensearch-Dashboards - ref: ${{ env.OPENSEARCH_VERSION }} - path: dashboards-reports/OpenSearch-Dashboards - - - name: Setup Node - uses: actions/setup-node@v1 - with: - node-version: "10.24.1" - - - name: Move Dashboards Reports to Plugins Dir - run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - - - name: Add Chromium Binary to Reporting for Testing - run: | - sudo apt install -y libnss3-dev fonts-liberation libfontconfig1 - cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip - unzip chromium-linux-x64.zip - rm chromium-linux-x64.zip - - - name: OpenSearch Dashboards Plugin Bootstrap - uses: nick-invision/retry@v1 - with: - timeout_minutes: 30 - max_attempts: 3 - command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn osd bootstrap - - - name: Test - uses: nick-invision/retry@v1 - with: - timeout_minutes: 30 - max_attempts: 3 - command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn test - - - name: Build Artifact and upload to S3 - run: | - cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - yarn build - - cd build - mkdir -p ./{linux-x64,linux-arm64,windows-x64}/OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip - cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip - mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip - - s3_prefix="s3://staging.artifacts.opendistroforelasticsearch.amazon.com/snapshots/kibana-plugins/reports/" - - cd linux-x64 - wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip - unzip chromium-linux-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - rm chromium-linux-x64.zip - zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./OpenSearch-Dashboards - linux_x64_artifact=`ls ./${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip` - - #Inject build number before the suffix and upload to S3 - linux_x64_artifact_outfile=`basename ${linux_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` - echo "Copying $linux_x64_artifact to ${s3_prefix}${linux_x64_artifact_outfile}" - aws s3 cp --quiet $linux_x64_artifact ${s3_prefix}${linux_x64_artifact_outfile} - cd .. - - cd linux-arm64 - wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-arm64.zip - unzip chromium-linux-arm64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - rm chromium-linux-arm64.zip - zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./OpenSearch-Dashboards - linux_arm64_artifact=`ls ./${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip` - - #Inject build number before the suffix and upload to S3 - linux_arm64_artifact_outfile=`basename ${linux_arm64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` - echo "Copying $linux_arm64_artifact to ${s3_prefix}${linux_arm64_artifact_outfile}" - aws s3 cp --quiet $linux_arm64_artifact ${s3_prefix}${linux_arm64_artifact_outfile} - cd .. - - cd windows-x64 - wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip - unzip chromium-windows-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - rm chromium-windows-x64.zip - zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./OpenSearch-Dashboards - windows_x64_artifact=`ls ./${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip` - - #Inject build number before the suffix and upload to S3 - windows_x64_artifact_outfile=`basename ${windows_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` - echo "Copying $windows_x64_artifact to ${s3_prefix}${windows_x64_artifact_outfile}" - aws s3 cp --quiet $windows_x64_artifact ${s3_prefix}${windows_x64_artifact_outfile} - diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 3d5ee688..379fe020 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -9,7 +9,7 @@ env: OPENSEARCH_PLUGIN_VERSION: 2.1.0.0 jobs: - build: + linux-build: runs-on: ubuntu-latest steps: - name: Checkout Plugin @@ -73,11 +73,10 @@ jobs: yarn build cd build - mkdir -p ./{linux-x64,linux-arm64,windows-x64}/opensearch-dashboards/${{ env.PLUGIN_NAME }} + mkdir -p ./{linux-x64,linux-arm64}/opensearch-dashboards/${{ env.PLUGIN_NAME }} cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip - mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip - + cd linux-x64 wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip unzip chromium-linux-x64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }} @@ -92,13 +91,6 @@ jobs: mv ./${{ env.ARTIFACT_NAME }}-*.zip .. cd .. - cd windows-x64 - wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip - unzip chromium-windows-x64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }} - zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./opensearch-dashboards - mv ./${{ env.ARTIFACT_NAME }}-*.zip .. - cd .. - - name: Upload Artifact For Linux x64 uses: actions/upload-artifact@v1 with: @@ -111,8 +103,152 @@ jobs: name: dashboards-reports-linux-arm64 path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip + windows-build: + runs-on: windows-latest + steps: + - name: Checkout Plugin + uses: actions/checkout@v1 + + # Enable longer filenames for windows + - name: Enable longer filenames + run: git config --system core.longpaths true + + - name: Checkout OpenSearch Dashboards + uses: actions/checkout@v1 + with: + repository: opensearch-project/Opensearch-Dashboards + ref: ${{ env.OPENSEARCH_VERSION }} + path: dashboards-reports/OpenSearch-Dashboards + + - name: Get node version + id: versions_step + run: + echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")" + + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: ${{ steps.versions_step.outputs.node_version }} + registry-url: 'https://registry.npmjs.org' + + + - name: Move Dashboards Reports to Plugins Dir + run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + + - name: Add Chromium Binary to Reporting for Testing + run: | + sudo apt update + sudo apt install -y libnss3-dev fonts-liberation libfontconfig1 + cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip + unzip chromium-windows-x64.zip + rm chromium-windows-x64.zip + + - name: OpenSearch Dashboards Plugin Bootstrap + uses: nick-invision/retry@v1 + with: + timeout_minutes: 30 + max_attempts: 3 + command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn osd bootstrap + + - name: Test + uses: nick-invision/retry@v1 + with: + timeout_minutes: 30 + max_attempts: 3 + command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn test + + - name: Build Artifact + run: | + cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + yarn build + + cd build + mkdir -p ./windows-x64/opensearch-dashboards/${{ env.PLUGIN_NAME }} + mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip + + cd windows-x64 + wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip + unzip chromium-windows-x64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }} + zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./opensearch-dashboards + mv ./${{ env.ARTIFACT_NAME }}-*.zip .. + cd .. + - name: Upload Artifact For Windows uses: actions/upload-artifact@v1 with: name: dashboards-reports-windows-x64 path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip + + macos-build: + runs-on: macos-latest + steps: + - name: Checkout Plugin + uses: actions/checkout@v1 + + - name: Checkout OpenSearch Dashboards + uses: actions/checkout@v1 + with: + repository: opensearch-project/Opensearch-Dashboards + ref: ${{ env.OPENSEARCH_VERSION }} + path: dashboards-reports/OpenSearch-Dashboards + + - name: Get node version + id: versions_step + run: + echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")" + + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: ${{ steps.versions_step.outputs.node_version }} + registry-url: 'https://registry.npmjs.org' + + + - name: Move Dashboards Reports to Plugins Dir + run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + + - name: Add Chromium Binary to Reporting for Testing + run: | + sudo apt update + sudo apt install -y libnss3-dev fonts-liberation libfontconfig1 + cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-macos-x64.zip + unzip chromium-macos-x64.zip + rm chromium-macos-x64.zip + + - name: OpenSearch Dashboards Plugin Bootstrap + uses: nick-invision/retry@v1 + with: + timeout_minutes: 30 + max_attempts: 3 + command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn osd bootstrap + + - name: Test + uses: nick-invision/retry@v1 + with: + timeout_minutes: 30 + max_attempts: 3 + command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn test + + - name: Build Artifact + run: | + cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + yarn build + + cd build + mkdir -p ./macos-x64/opensearch-dashboards/${{ env.PLUGIN_NAME }} + mv ./${{ env.PLUGIN_NAME }}-*.zip ./macos-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-macos-x64.zip + + cd macos-x64 + wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-macos-x64.zip + unzip chromium-macos-x64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }} + zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./opensearch-dashboards + mv ./${{ env.ARTIFACT_NAME }}-*.zip .. + cd .. + + - name: Upload Artifact For MacOS x64 + uses: actions/upload-artifact@v1 + with: + name: dashboards-reports-macosx-x64 + path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-macos-x64.zip From 445a9cb950ae24631228bc5215c2ebbf0a9b3c18 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 11 Oct 2022 15:35:01 -0400 Subject: [PATCH 03/22] remove apt commands for windows and mac Signed-off-by: Derek Ho --- .../dashboards-reports-test-and-build-workflow.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 379fe020..484e21f2 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -76,7 +76,7 @@ jobs: mkdir -p ./{linux-x64,linux-arm64}/opensearch-dashboards/${{ env.PLUGIN_NAME }} cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip - + cd linux-x64 wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip unzip chromium-linux-x64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }} @@ -137,8 +137,6 @@ jobs: - name: Add Chromium Binary to Reporting for Testing run: | - sudo apt update - sudo apt install -y libnss3-dev fonts-liberation libfontconfig1 cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip unzip chromium-windows-x64.zip @@ -210,8 +208,6 @@ jobs: - name: Add Chromium Binary to Reporting for Testing run: | - sudo apt update - sudo apt install -y libnss3-dev fonts-liberation libfontconfig1 cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-macos-x64.zip unzip chromium-macos-x64.zip From 4b50e3ba42816998a70753c12748585f4c18ce14 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 11 Oct 2022 15:57:57 -0400 Subject: [PATCH 04/22] remove chromium Signed-off-by: Derek Ho --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 484e21f2..5daca2d1 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -138,9 +138,6 @@ jobs: - name: Add Chromium Binary to Reporting for Testing run: | cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip - unzip chromium-windows-x64.zip - rm chromium-windows-x64.zip - name: OpenSearch Dashboards Plugin Bootstrap uses: nick-invision/retry@v1 From 04d588af293d314f106a42a8e2fe9123888d98d0 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 11 Oct 2022 16:08:25 -0400 Subject: [PATCH 05/22] alternative to wget Signed-off-by: Derek Ho --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 5daca2d1..26be803e 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -138,6 +138,9 @@ jobs: - name: Add Chromium Binary to Reporting for Testing run: | cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} + (new-object System.Net.WebClient).DownloadFile('https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip ','chromium-windows-x64.zip') + unzip chromium-linux-x64.zip + rm chromium-linux-x64.zip - name: OpenSearch Dashboards Plugin Bootstrap uses: nick-invision/retry@v1 From 59a1444b3cfa5e602379480b6534cd4841d7330a Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 11 Oct 2022 16:14:32 -0400 Subject: [PATCH 06/22] fix file names Signed-off-by: Derek Ho --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 26be803e..1da6c7f1 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -139,8 +139,8 @@ jobs: run: | cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} (new-object System.Net.WebClient).DownloadFile('https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip ','chromium-windows-x64.zip') - unzip chromium-linux-x64.zip - rm chromium-linux-x64.zip + unzip chromium-windows-x64.zip + rm chromium-windows-x64.zip - name: OpenSearch Dashboards Plugin Bootstrap uses: nick-invision/retry@v1 From eb46482fccd35ff94072144855ebecdedd8d06de Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 12 Oct 2022 15:58:54 -0400 Subject: [PATCH 07/22] run ci for reports-shceduler on windows and macos Signed-off-by: Derek Ho --- ...boards-reports-test-and-build-workflow.yml | 2 +- ...orts-scheduler-test-and-build-workflow.yml | 84 ++++++++++++++++++- 2 files changed, 83 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 1da6c7f1..83e9b044 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -138,7 +138,7 @@ jobs: - name: Add Chromium Binary to Reporting for Testing run: | cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - (new-object System.Net.WebClient).DownloadFile('https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip ','chromium-windows-x64.zip') + (new-object System.Net.WebClient).DownloadFile('https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip','chromium-windows-x64.zip') unzip chromium-windows-x64.zip rm chromium-windows-x64.zip diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml index 4c4a4844..d46e6606 100644 --- a/.github/workflows/reports-scheduler-test-and-build-workflow.yml +++ b/.github/workflows/reports-scheduler-test-and-build-workflow.yml @@ -3,7 +3,7 @@ name: Test and Build Reports Scheduler on: [push, pull_request] jobs: - build: + linux-build: strategy: matrix: java: @@ -47,5 +47,85 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v1 with: - name: reports-scheduler + name: reports-scheduler-linux + path: reports-scheduler-builds + + windows-build: + strategy: + matrix: + java: + - 11 + - 17 + runs-on: windows-latest + + steps: + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + + # reports-scheduler + - name: Checkout Reports Scheduler + uses: actions/checkout@v2 + + - name: RunBackwards Compatibility Tests + run: | + cd reports-scheduler + echo "Running backwards compatibility tests ..." + ./gradlew.bat bwcTestSuite + + - name: Build with Gradle + run: | + cd reports-scheduler + ./gradlew.bat build + + - name: Create Artifact Path + run: | + mkdir -p reports-scheduler-builds + cp -r ./reports-scheduler/build/distributions/*.zip reports-scheduler-builds/ + + - name: Upload Artifacts + uses: actions/upload-artifact@v1 + with: + name: reports-scheduler-windows + path: reports-scheduler-builds + + macos-build: + strategy: + matrix: + java: + - 11 + - 17 + runs-on: macos-latest + + steps: + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + + # reports-scheduler + - name: Checkout Reports Scheduler + uses: actions/checkout@v2 + + - name: RunBackwards Compatibility Tests + run: | + cd reports-scheduler + echo "Running backwards compatibility tests ..." + ./gradlew bwcTestSuite + + - name: Build with Gradle + run: | + cd reports-scheduler + ./gradlew build + + - name: Create Artifact Path + run: | + mkdir -p reports-scheduler-builds + cp -r ./reports-scheduler/build/distributions/*.zip reports-scheduler-builds/ + + - name: Upload Artifacts + uses: actions/upload-artifact@v1 + with: + name: reports-scheduler-macos path: reports-scheduler-builds From c4fbcda5c2114678f4aeebee9256aef2c76482a6 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 12 Oct 2022 17:39:53 -0400 Subject: [PATCH 08/22] add commands for windows and comment out bwc for windows and mac Signed-off-by: Derek Ho --- ...boards-reports-test-and-build-workflow.yml | 6 ++--- ...orts-scheduler-test-and-build-workflow.yml | 22 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 83e9b044..efd5583e 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -138,9 +138,9 @@ jobs: - name: Add Chromium Binary to Reporting for Testing run: | cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - (new-object System.Net.WebClient).DownloadFile('https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip','chromium-windows-x64.zip') - unzip chromium-windows-x64.zip - rm chromium-windows-x64.zip + curl.exe -LO https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip + Expand-Archive -Path 'chromium-windows-x64.zip' + rd chromium-windows-x64.zip - name: OpenSearch Dashboards Plugin Bootstrap uses: nick-invision/retry@v1 diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml index d46e6606..b7ba5345 100644 --- a/.github/workflows/reports-scheduler-test-and-build-workflow.yml +++ b/.github/workflows/reports-scheduler-test-and-build-workflow.yml @@ -68,11 +68,12 @@ jobs: - name: Checkout Reports Scheduler uses: actions/checkout@v2 - - name: RunBackwards Compatibility Tests - run: | - cd reports-scheduler - echo "Running backwards compatibility tests ..." - ./gradlew.bat bwcTestSuite + # Disable bwc tests since first release + # - name: RunBackwards Compatibility Tests + # run: | + # cd reports-scheduler + # echo "Running backwards compatibility tests ..." + # ./gradlew.bat bwcTestSuite - name: Build with Gradle run: | @@ -108,11 +109,12 @@ jobs: - name: Checkout Reports Scheduler uses: actions/checkout@v2 - - name: RunBackwards Compatibility Tests - run: | - cd reports-scheduler - echo "Running backwards compatibility tests ..." - ./gradlew bwcTestSuite + # Disable bwc tests since first release + # - name: RunBackwards Compatibility Tests + # run: | + # cd reports-scheduler + # echo "Running backwards compatibility tests ..." + # ./gradlew bwcTestSuite - name: Build with Gradle run: | From b99f6e6749e846bfb20b3c63730f325dc73bc2fb Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 12 Oct 2022 17:47:32 -0400 Subject: [PATCH 09/22] disable integration for windows and mac Signed-off-by: Derek Ho --- .../workflows/reports-scheduler-test-and-build-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml index b7ba5345..01576aa1 100644 --- a/.github/workflows/reports-scheduler-test-and-build-workflow.yml +++ b/.github/workflows/reports-scheduler-test-and-build-workflow.yml @@ -78,7 +78,7 @@ jobs: - name: Build with Gradle run: | cd reports-scheduler - ./gradlew.bat build + ./gradlew.bat build -x integTest -x jacocoTestReport - name: Create Artifact Path run: | @@ -119,7 +119,7 @@ jobs: - name: Build with Gradle run: | cd reports-scheduler - ./gradlew build + ./gradlew build -x integTest -x jacocoTestReport - name: Create Artifact Path run: | From 4a68e6905857e96325a8a8d56c0515d9e05ae1bd Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Thu, 13 Oct 2022 15:39:57 -0400 Subject: [PATCH 10/22] fix up tests and change semicolon to && Signed-off-by: Derek Ho --- ...ashboards-reports-test-and-build-workflow.yml | 4 ++-- .../__snapshots__/report_details.test.tsx.snap | 4 ++-- .../__snapshots__/report_settings.test.tsx.snap | 16 ++++++++-------- dashboards-reports/test/jest.config.js | 4 +++- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index efd5583e..d2f72731 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -147,14 +147,14 @@ jobs: with: timeout_minutes: 30 max_attempts: 3 - command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn osd bootstrap + command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} && yarn osd bootstrap - name: Test uses: nick-invision/retry@v1 with: timeout_minutes: 30 max_attempts: 3 - command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}; yarn test + command: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} && yarn test - name: Build Artifact run: | diff --git a/dashboards-reports/public/components/main/report_details/__tests__/__snapshots__/report_details.test.tsx.snap b/dashboards-reports/public/components/main/report_details/__tests__/__snapshots__/report_details.test.tsx.snap index a36d7798..7d0b79f6 100644 --- a/dashboards-reports/public/components/main/report_details/__tests__/__snapshots__/report_details.test.tsx.snap +++ b/dashboards-reports/public/components/main/report_details/__tests__/__snapshots__/report_details.test.tsx.snap @@ -192,7 +192,7 @@ exports[` panel render 5 hours recurring component 1`] = `
- Invalid Date -> 10/23/2020, 1:53:35 PM + Invalid Date -> 10/23/2020, 8:53:35 PM
@@ -599,7 +599,7 @@ exports[` panel render on-demand component 1`] = `
- Invalid Date -> 10/23/2020, 1:53:35 PM + Invalid Date -> 10/23/2020, 8:53:35 PM
diff --git a/dashboards-reports/public/components/report_definitions/report_settings/__tests__/__snapshots__/report_settings.test.tsx.snap b/dashboards-reports/public/components/report_definitions/report_settings/__tests__/__snapshots__/report_settings.test.tsx.snap index 4c923442..d348db59 100644 --- a/dashboards-reports/public/components/report_definitions/report_settings/__tests__/__snapshots__/report_settings.test.tsx.snap +++ b/dashboards-reports/public/components/report_definitions/report_settings/__tests__/__snapshots__/report_settings.test.tsx.snap @@ -402,7 +402,7 @@ exports[` panel dashboard create from in-context 1`] = ` data-test-subj="superDatePickerstartDatePopoverButton" title="2020-10-26T20:52:56.382Z" > - Oct 26, 2020 @ 13:52:56.382 + Oct 26, 2020 @ 20:52:56.382 @@ -426,7 +426,7 @@ exports[` panel dashboard create from in-context 1`] = ` data-test-subj="superDatePickerendDatePopoverButton" title="2020-10-27T20:52:56.384Z" > - Oct 27, 2020 @ 13:52:56.384 + Oct 27, 2020 @ 20:52:56.384 @@ -1585,7 +1585,7 @@ exports[` panel display errors on create 1`] = ` data-test-subj="superDatePickerstartDatePopoverButton" title="2020-10-26T20:52:56.382Z" > - Oct 26, 2020 @ 13:52:56.382 + Oct 26, 2020 @ 20:52:56.382 @@ -1609,7 +1609,7 @@ exports[` panel display errors on create 1`] = ` data-test-subj="superDatePickerendDatePopoverButton" title="2020-10-27T20:52:56.384Z" > - Oct 27, 2020 @ 13:52:56.384 + Oct 27, 2020 @ 20:52:56.384 @@ -6506,7 +6506,7 @@ exports[` panel saved search create from in-context 1`] = ` data-test-subj="superDatePickerstartDatePopoverButton" title="2020-10-26T20:52:56.382Z" > - Oct 26, 2020 @ 13:52:56.382 + Oct 26, 2020 @ 20:52:56.382 @@ -6530,7 +6530,7 @@ exports[` panel saved search create from in-context 1`] = ` data-test-subj="superDatePickerendDatePopoverButton" title="2020-10-27T20:52:56.384Z" > - Oct 27, 2020 @ 13:52:56.384 + Oct 27, 2020 @ 20:52:56.384 @@ -7689,7 +7689,7 @@ exports[` panel visualization create from in-context 1`] = ` data-test-subj="superDatePickerstartDatePopoverButton" title="2020-10-26T20:52:56.382Z" > - Oct 26, 2020 @ 13:52:56.382 + Oct 26, 2020 @ 20:52:56.382 @@ -7713,7 +7713,7 @@ exports[` panel visualization create from in-context 1`] = ` data-test-subj="superDatePickerendDatePopoverButton" title="2020-10-27T20:52:56.384Z" > - Oct 27, 2020 @ 13:52:56.384 + Oct 27, 2020 @ 20:52:56.384 diff --git a/dashboards-reports/test/jest.config.js b/dashboards-reports/test/jest.config.js index ec861b87..a8756693 100644 --- a/dashboards-reports/test/jest.config.js +++ b/dashboards-reports/test/jest.config.js @@ -3,7 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -process.env.TZ = 'America/Los_Angeles'; +//@ts-check + +process.env.TZ = 'UTC'; module.exports = { rootDir: '../', From 7b0cc70c1d50fb211b368b13fd6383d2c3c96f84 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 17 Oct 2022 11:21:16 -0400 Subject: [PATCH 11/22] try with current windows binary Signed-off-by: Derek Ho --- .../dashboards-reports-test-and-build-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index d2f72731..cb02f593 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -138,9 +138,9 @@ jobs: - name: Add Chromium Binary to Reporting for Testing run: | cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - curl.exe -LO https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip - Expand-Archive -Path 'chromium-windows-x64.zip' - rd chromium-windows-x64.zip + curl.exe -LO https://github.com/Hibbiki/chromium-win64/archive/refs/tags/v106.0.5249.119-r1036826.zip + Expand-Archive -Path 'chromium-win64-106.0.5249.119-r1036826.zip' + rd chromium-win64-106.0.5249.119-r1036826.zip - name: OpenSearch Dashboards Plugin Bootstrap uses: nick-invision/retry@v1 From 443b13a4d246e46ddce40000cd52a814f919ee39 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 18 Oct 2022 12:14:17 -0400 Subject: [PATCH 12/22] use new binary Signed-off-by: Derek Ho --- .../dashboards-reports-test-and-build-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index cb02f593..d67f2995 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -138,9 +138,9 @@ jobs: - name: Add Chromium Binary to Reporting for Testing run: | cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - curl.exe -LO https://github.com/Hibbiki/chromium-win64/archive/refs/tags/v106.0.5249.119-r1036826.zip - Expand-Archive -Path 'chromium-win64-106.0.5249.119-r1036826.zip' - rd chromium-win64-106.0.5249.119-r1036826.zip + curl.exe -LO https://github.com/rupal-bq/dashboards-reports/releases/download/chromium-bundle/chromium-windows.zip + Expand-Archive -Path 'chromium-windows.zip' + rd chromium-windows.zip - name: OpenSearch Dashboards Plugin Bootstrap uses: nick-invision/retry@v1 From 8d4c9605fd775fd7b486dee3613349d9879a52a7 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 18 Oct 2022 13:40:14 -0400 Subject: [PATCH 13/22] newline Signed-off-by: Derek Ho --- .github/workflows/dashboards-reports-test-and-build-workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index d67f2995..371c4149 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -8,6 +8,7 @@ env: OPENSEARCH_VERSION: 'main' OPENSEARCH_PLUGIN_VERSION: 2.1.0.0 + jobs: linux-build: runs-on: ubuntu-latest From 069b55980d720b2dd1c06bc8592994c2b06de1f2 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 18 Oct 2022 16:31:39 -0400 Subject: [PATCH 14/22] correct commands for windows Signed-off-by: Derek Ho --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 371c4149..42db4461 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -142,6 +142,8 @@ jobs: curl.exe -LO https://github.com/rupal-bq/dashboards-reports/releases/download/chromium-bundle/chromium-windows.zip Expand-Archive -Path 'chromium-windows.zip' rd chromium-windows.zip + Move-Item -Path "./chromium-windows/.chromium" -Destination "./.chromium" + rd chromium-windows - name: OpenSearch Dashboards Plugin Bootstrap uses: nick-invision/retry@v1 From 86f9617406a74681daad761cb1f9cf69fc58437f Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 18 Oct 2022 17:06:52 -0400 Subject: [PATCH 15/22] run equivalent windows commands Signed-off-by: Derek Ho --- .../dashboards-reports-test-and-build-workflow.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 42db4461..263549a4 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -169,8 +169,11 @@ jobs: mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip cd windows-x64 - wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip - unzip chromium-windows-x64.zip -d ./opensearch-dashboards/${{ env.PLUGIN_NAME }} + curl.exe -LO https://github.com/rupal-bq/dashboards-reports/releases/download/chromium-bundle/chromium-windows.zip + Expand-Archive -Path 'chromium-windows.zip' + rd chromium-windows.zip + Move-Item -Path "./chromium-windows/.chromium" -Destination "./opensearch-dashboards/${{ env.PLUGIN_NAME }}" + rd chromium-windows zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./opensearch-dashboards mv ./${{ env.ARTIFACT_NAME }}-*.zip .. cd .. From 4a456763b22e08d982b3df458ee1895418d51bf0 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 18 Oct 2022 17:34:36 -0400 Subject: [PATCH 16/22] correct commands for windows Signed-off-by: Derek Ho --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 263549a4..6b8217f0 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -174,7 +174,7 @@ jobs: rd chromium-windows.zip Move-Item -Path "./chromium-windows/.chromium" -Destination "./opensearch-dashboards/${{ env.PLUGIN_NAME }}" rd chromium-windows - zip -ur ./${{ env.ARTIFACT_NAME }}-*.zip ./opensearch-dashboards + Compress-Archive -Path ""./${{ env.ARTIFACT_NAME }}-*.zip" -Destination ""./opensearch-dashboards" mv ./${{ env.ARTIFACT_NAME }}-*.zip .. cd .. From 6b86a44c277632babc687d7a176c65f853b66ece Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 18 Oct 2022 18:15:55 -0400 Subject: [PATCH 17/22] remove extra quote Signed-off-by: Derek Ho --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 6b8217f0..cadba0c9 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -174,7 +174,7 @@ jobs: rd chromium-windows.zip Move-Item -Path "./chromium-windows/.chromium" -Destination "./opensearch-dashboards/${{ env.PLUGIN_NAME }}" rd chromium-windows - Compress-Archive -Path ""./${{ env.ARTIFACT_NAME }}-*.zip" -Destination ""./opensearch-dashboards" + Compress-Archive -Path "./${{ env.ARTIFACT_NAME }}-*.zip" -Destination ""./opensearch-dashboards" mv ./${{ env.ARTIFACT_NAME }}-*.zip .. cd .. From bdde94e24c1648b898bad47b521cfcc3ac9d5436 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 18 Oct 2022 18:37:09 -0400 Subject: [PATCH 18/22] remove second unecessary quote Signed-off-by: Derek Ho --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index cadba0c9..6d3109b9 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -174,7 +174,7 @@ jobs: rd chromium-windows.zip Move-Item -Path "./chromium-windows/.chromium" -Destination "./opensearch-dashboards/${{ env.PLUGIN_NAME }}" rd chromium-windows - Compress-Archive -Path "./${{ env.ARTIFACT_NAME }}-*.zip" -Destination ""./opensearch-dashboards" + Compress-Archive -Path "./${{ env.ARTIFACT_NAME }}-*.zip" -Destination "./opensearch-dashboards" mv ./${{ env.ARTIFACT_NAME }}-*.zip .. cd .. From e341a02d9f12f909534104f79691dea58393ece3 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 19 Oct 2022 15:03:47 -0400 Subject: [PATCH 19/22] change commands to get from source Signed-off-by: Derek Ho --- .../dashboards-reports-test-and-build-workflow.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 6d3109b9..9fc7c11a 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -139,11 +139,9 @@ jobs: - name: Add Chromium Binary to Reporting for Testing run: | cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - curl.exe -LO https://github.com/rupal-bq/dashboards-reports/releases/download/chromium-bundle/chromium-windows.zip - Expand-Archive -Path 'chromium-windows.zip' - rd chromium-windows.zip - Move-Item -Path "./chromium-windows/.chromium" -Destination "./.chromium" - rd chromium-windows + curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/tag/chromium-1.12.0.0/chromium-windows-x64.zip + Expand-Archive -Path 'chromium-windows-x64.zip' + rd chromium-windows-x64.zip - name: OpenSearch Dashboards Plugin Bootstrap uses: nick-invision/retry@v1 @@ -169,7 +167,7 @@ jobs: mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip cd windows-x64 - curl.exe -LO https://github.com/rupal-bq/dashboards-reports/releases/download/chromium-bundle/chromium-windows.zip + curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/tag/chromium-1.12.0.0 Expand-Archive -Path 'chromium-windows.zip' rd chromium-windows.zip Move-Item -Path "./chromium-windows/.chromium" -Destination "./opensearch-dashboards/${{ env.PLUGIN_NAME }}" From 6faee9060985db86dc0ed11903352b473ee2ddd4 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 19 Oct 2022 15:05:31 -0400 Subject: [PATCH 20/22] fix path Signed-off-by: Derek Ho --- .../dashboards-reports-test-and-build-workflow.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 9fc7c11a..dd94cc45 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -167,11 +167,10 @@ jobs: mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip cd windows-x64 - curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/tag/chromium-1.12.0.0 - Expand-Archive -Path 'chromium-windows.zip' - rd chromium-windows.zip - Move-Item -Path "./chromium-windows/.chromium" -Destination "./opensearch-dashboards/${{ env.PLUGIN_NAME }}" - rd chromium-windows + curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/tag/chromium-1.12.0.0/chromium-windows-x64.zip + Expand-Archive -Path 'chromium-windows-x64.zip' + rd chromium-windows-x64.zip + Move-Item -Path ".chromium" -Destination "./opensearch-dashboards/${{ env.PLUGIN_NAME }}" Compress-Archive -Path "./${{ env.ARTIFACT_NAME }}-*.zip" -Destination "./opensearch-dashboards" mv ./${{ env.ARTIFACT_NAME }}-*.zip .. cd .. From 71ab8d88c485fa0136a9647a06e68f83c9a902bd Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 19 Oct 2022 15:12:22 -0400 Subject: [PATCH 21/22] right link Signed-off-by: Derek Ho --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index dd94cc45..bcff873b 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -139,7 +139,7 @@ jobs: - name: Add Chromium Binary to Reporting for Testing run: | cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/tag/chromium-1.12.0.0/chromium-windows-x64.zip + curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip Expand-Archive -Path 'chromium-windows-x64.zip' rd chromium-windows-x64.zip @@ -167,7 +167,7 @@ jobs: mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip cd windows-x64 - curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/tag/chromium-1.12.0.0/chromium-windows-x64.zip + curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip Expand-Archive -Path 'chromium-windows-x64.zip' rd chromium-windows-x64.zip Move-Item -Path ".chromium" -Destination "./opensearch-dashboards/${{ env.PLUGIN_NAME }}" From 64cc6475e86bebec3d0943be07fbf5c2f6b25f86 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 19 Oct 2022 16:06:21 -0400 Subject: [PATCH 22/22] fix windows workflow Signed-off-by: Derek Ho --- .../workflows/dashboards-reports-test-and-build-workflow.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index bcff873b..0e898d79 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -141,7 +141,9 @@ jobs: cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip Expand-Archive -Path 'chromium-windows-x64.zip' + Move-Item -Path "./chromium-windows-x64/.chromium" -Destination "./.chromium" rd chromium-windows-x64.zip + rd chromium-windows-x64 - name: OpenSearch Dashboards Plugin Bootstrap uses: nick-invision/retry@v1 @@ -169,8 +171,9 @@ jobs: cd windows-x64 curl.exe -LO https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip Expand-Archive -Path 'chromium-windows-x64.zip' + Move-Item -Path "./chromium-windows-x64/.chromium" -Destination "./opensearch-dashboards/${{ env.PLUGIN_NAME }}" rd chromium-windows-x64.zip - Move-Item -Path ".chromium" -Destination "./opensearch-dashboards/${{ env.PLUGIN_NAME }}" + rd chromium-windows-x64 Compress-Archive -Path "./${{ env.ARTIFACT_NAME }}-*.zip" -Destination "./opensearch-dashboards" mv ./${{ env.ARTIFACT_NAME }}-*.zip .. cd ..