-
Notifications
You must be signed in to change notification settings - Fork 890
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into chore/vega-lite-v5-from-source
- Loading branch information
Showing
39 changed files
with
647 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,10 +9,12 @@ on: | |
| branches: [ '**', '!backport/**' ] | ||
| paths-ignore: | ||
| - '**/*.md' | ||
| - 'docs/**' | ||
| pull_request: | ||
| branches: [ '**' ] | ||
| paths-ignore: | ||
| - '**/*.md' | ||
| - 'docs/**' | ||
|
|
||
| env: | ||
| TEST_BROWSER_HEADLESS: 1 | ||
|
|
@@ -45,6 +47,18 @@ jobs: | |
| run: | | ||
| npm uninstall -g yarn | ||
| npm i -g [email protected] | ||
| yarn config set network-timeout 1000000 -g | ||
| - name: Configure Yarn Cache | ||
| run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV | ||
|
|
||
| - name: Initialize Yarn Cache | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ${{ env.YARN_CACHE_LOCATION }} | ||
| key: yarn-${{ hashFiles('**/yarn.lock') }} | ||
| restore-keys: | | ||
| yarn- | ||
| - name: Run bootstrap | ||
| run: yarn osd bootstrap | ||
|
|
@@ -103,9 +117,23 @@ jobs: | |
| run: | | ||
| npm uninstall -g yarn | ||
| npm i -g [email protected] | ||
| yarn config set network-timeout 1000000 -g | ||
| - name: Configure Yarn Cache | ||
| run: | | ||
| echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $env:GITHUB_ENV | ||
| echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%" | ||
| - name: Initialize Yarn Cache | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ${{ env.YARN_CACHE_LOCATION }} | ||
| key: yarn-${{ hashFiles('**/yarn.lock') }} | ||
| restore-keys: | | ||
| yarn- | ||
| - name: Run bootstrap | ||
| run: yarn osd bootstrap | ||
| run: yarn osd bootstrap || yarn osd bootstrap | ||
|
|
||
| - name: Run linter | ||
| id: linter | ||
|
|
@@ -159,6 +187,18 @@ jobs: | |
| run: | | ||
| npm uninstall -g yarn | ||
| npm i -g [email protected] | ||
| yarn config set network-timeout 1000000 -g | ||
| - name: Configure Yarn Cache | ||
| run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV | ||
|
|
||
| - name: Initialize Yarn Cache | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ${{ env.YARN_CACHE_LOCATION }} | ||
| key: yarn-${{ hashFiles('**/yarn.lock') }} | ||
| restore-keys: | | ||
| yarn- | ||
| - name: Setup chromedriver | ||
| run: node scripts/upgrade_chromedriver.js | ||
|
|
@@ -178,6 +218,14 @@ jobs: | |
| JOB: ci${{ matrix.group }} | ||
| CACHE_DIR: ciGroup${{ matrix.group }} | ||
|
|
||
| - uses: actions/upload-artifact@v3 | ||
| if: failure() | ||
| with: | ||
| name: failure-artifacts | ||
| path: | | ||
| test/*/failure_debug/ | ||
| test/*/screenshots/ | ||
| functional-tests-windows: | ||
| runs-on: windows-latest | ||
| name: Run functional tests on Windows | ||
|
|
@@ -210,12 +258,26 @@ jobs: | |
| run: | | ||
| npm uninstall -g yarn | ||
| npm i -g [email protected] | ||
| yarn config set network-timeout 1000000 -g | ||
| - name: Configure Yarn Cache | ||
| run: | | ||
| echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $env:GITHUB_ENV | ||
| echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%" | ||
| - name: Initialize Yarn Cache | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ${{ env.YARN_CACHE_LOCATION }} | ||
| key: yarn-${{ hashFiles('**/yarn.lock') }} | ||
| restore-keys: | | ||
| yarn- | ||
| - name: Setup chromedriver | ||
| run: node scripts/upgrade_chromedriver.js | ||
|
|
||
| - name: Run bootstrap | ||
| run: yarn osd bootstrap | ||
| run: yarn osd bootstrap || yarn osd bootstrap | ||
|
|
||
| - name: Build plugins | ||
| run: node scripts/build_opensearch_dashboards_platform_plugins --no-examples --workers 10 | ||
|
|
@@ -229,6 +291,14 @@ jobs: | |
| JOB: ci${{ matrix.group }} | ||
| CACHE_DIR: ciGroup${{ matrix.group }} | ||
|
|
||
| - uses: actions/upload-artifact@v3 | ||
| if: failure() | ||
| with: | ||
| name: failure-artifacts-ci${{ matrix.group }} | ||
| path: | | ||
| test/*/failure_debug/ | ||
| test/*/screenshots/ | ||
| build-min-artifact-tests-linux: | ||
| runs-on: ubuntu-latest | ||
| container: | ||
|
|
@@ -265,6 +335,18 @@ jobs: | |
| run: | | ||
| npm uninstall -g yarn | ||
| npm i -g [email protected] | ||
| yarn config set network-timeout 1000000 -g | ||
| - name: Configure Yarn Cache | ||
| run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV | ||
|
|
||
| - name: Initialize Yarn Cache | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ${{ env.YARN_CACHE_LOCATION }} | ||
| key: yarn-${{ hashFiles('**/yarn.lock') }} | ||
| restore-keys: | | ||
| yarn- | ||
| - name: Get package version | ||
| run: | | ||
|
|
@@ -321,6 +403,20 @@ jobs: | |
| run: | | ||
| npm uninstall -g yarn | ||
| npm i -g [email protected] | ||
| yarn config set network-timeout 1000000 -g | ||
| - name: Configure Yarn Cache | ||
| run: | | ||
| echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $env:GITHUB_ENV | ||
| echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%" | ||
| - name: Initialize Yarn Cache | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ${{ env.YARN_CACHE_LOCATION }} | ||
| key: yarn-${{ hashFiles('**/yarn.lock') }} | ||
| restore-keys: | | ||
| yarn- | ||
| - name: Get package version | ||
| run: | | ||
|
|
@@ -375,6 +471,18 @@ jobs: | |
| run: | | ||
| npm uninstall -g yarn | ||
| npm i -g [email protected] | ||
| yarn config set network-timeout 1000000 -g | ||
| - name: Configure Yarn Cache | ||
| run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV | ||
|
|
||
| - name: Initialize Yarn Cache | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ${{ env.YARN_CACHE_LOCATION }} | ||
| key: yarn-${{ hashFiles('**/yarn.lock') }} | ||
| restore-keys: | | ||
| yarn- | ||
| - name: Get package version | ||
| run: | | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 14.20.0 | ||
| 14.20.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 14.20.0 | ||
| 14.20.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| ARG NODE_VERSION=14.20.0 | ||
| ARG NODE_VERSION=14.20.1 | ||
| FROM node:${NODE_VERSION} AS base | ||
|
|
||
| ENV HOME '.' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,13 +88,15 @@ | |
| "**/hoist-non-react-statics": "^3.3.2", | ||
| "**/json-schema": "^0.4.0", | ||
| "**/kind-of": ">=6.0.3", | ||
| "**/loader-utils": "^2.0.3", | ||
| "**/loader-utils": "^2.0.4", | ||
| "**/node-jose": "^2.1.0", | ||
| "**/nth-check": "^2.0.1", | ||
| "**/qs": "^6.10.3", | ||
| "**/trim": "^0.0.3", | ||
| "**/typescript": "4.0.2", | ||
| "**/unset-value": "^2.0.1" | ||
| "**/unset-value": "^2.0.1", | ||
| "**/jest-config": "npm:@amoo-miki/[email protected]", | ||
| "**/jest-jasmine2": "npm:@amoo-miki/[email protected]" | ||
| }, | ||
| "workspaces": { | ||
| "packages": [ | ||
|
|
@@ -463,7 +465,7 @@ | |
| "zlib": "^1.0.5" | ||
| }, | ||
| "engines": { | ||
| "node": "14.20.0", | ||
| "node": "14.20.1", | ||
| "yarn": "^1.21.1" | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.