Merge branch 'workspace' into workspace-switch-new

ruanyl · Jun 20, 2023 · e06e01d · e06e01d
2 parents f2eef95 + 60b4278
commit e06e01d
Show file tree

Hide file tree

Showing 4 changed files with 1,699 additions and 96 deletions.
diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml
@@ -55,7 +55,8 @@ jobs:
         with:
           path: ${{ env.FTR_PATH }}
           repository: opensearch-project/opensearch-dashboards-functional-test
-          ref: '${{ github.base_ref }}'
+          # revert this to '${{ github.base_ref }}'
+          ref: 'main'
 
       - name: Get Cypress version
         id: cypress_version
@@ -88,7 +89,7 @@ jobs:
           name: ftr-cypress-screenshots
           path: ${{ env.FTR_PATH }}/cypress/screenshots
           retention-days: 1
-      
+
       - uses: actions/upload-artifact@v3
         if: always()
         with:
@@ -101,4 +102,4 @@ jobs:
         with:
           name: ftr-cypress-results
           path: ${{ env.FTR_PATH }}/cypress/results
-          retention-days: 1
+          retention-days: 1