-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into lforst-bump-bp
- Loading branch information
Showing
60 changed files
with
330 additions
and
242 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
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 |
---|---|---|
|
@@ -127,7 +127,9 @@ jobs: | |
runs-on: ubuntu-20.04 | ||
timeout-minutes: 15 | ||
if: | | ||
needs.job_get_metadata.outputs.changed_any_code == 'true' && | ||
needs.job_get_metadata.outputs.changed_any_code == 'true' || | ||
needs.job_get_metadata.outputs.is_develop == 'true' || | ||
needs.job_get_metadata.outputs.is_release == 'true' || | ||
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false') | ||
steps: | ||
- name: Check out base commit (${{ github.event.pull_request.base.sha }}) | ||
|
@@ -344,7 +346,7 @@ jobs: | |
name: ${{ github.sha }} | ||
path: | | ||
${{ github.workspace }}/packages/browser/build/bundles/** | ||
${{ github.workspace }}/packages/replay/build/bundles/** | ||
${{ github.workspace }}/packages/replay-internal/build/bundles/** | ||
${{ github.workspace }}/packages/replay-canvas/build/bundles/** | ||
${{ github.workspace }}/packages/feedback/build/bundles/** | ||
${{ github.workspace }}/packages/**/*.tgz | ||
|
@@ -454,7 +456,8 @@ jobs: | |
strategy: | ||
fail-fast: false | ||
matrix: | ||
node: [14, 16, 18, 20, 22] | ||
# TODO(lforst): Unpin Node.js version 22 when https://github.com/protobufjs/protobuf.js/issues/2025 is resolved which broke the nodejs tests | ||
node: [14, 16, 18, 20, '22.6.0'] | ||
steps: | ||
- name: Check out base commit (${{ github.event.pull_request.base.sha }}) | ||
uses: actions/checkout@v4 | ||
|
@@ -1416,31 +1419,29 @@ jobs: | |
with: | ||
ref: ${{ env.HEAD_COMMIT }} | ||
|
||
- name: Setup Node | ||
uses: actions/setup-node@v4 | ||
with: | ||
node-version: ${{ matrix.node }} | ||
|
||
- name: Restore dependency cache | ||
uses: actions/cache/restore@v4 | ||
id: restore-dependencies | ||
with: | ||
path: ${{ env.CACHED_DEPENDENCY_PATHS }} | ||
key: ${{ needs.job_build.outputs.dependency_cache_key }} | ||
enableCrossOsArchive: true | ||
fail-on-cache-miss: true | ||
|
||
- name: Restore build cache | ||
uses: actions/cache/restore@v4 | ||
id: restore-build | ||
with: | ||
path: ${{ env.CACHED_BUILD_PATHS }} | ||
key: ${{ needs.job_build.outputs.dependency_cache_key }} | ||
enableCrossOsArchive: true | ||
fail-on-cache-miss: true | ||
- name: Install dependencies | ||
env: | ||
SKIP_PLAYWRIGHT_BROWSER_INSTALL: "1" | ||
if: steps.restore-dependencies.outputs.cache-hit != 'true' | ||
run: yarn install --ignore-engines --frozen-lockfile | ||
|
||
- name: Configure safe directory | ||
run: | | ||
git config --global --add safe.directory "*" | ||
- name: Install yarn | ||
run: npm i -g [email protected] --force | ||
|
||
- name: Increase yarn network timeout on Windows | ||
if: contains(matrix.os, 'windows') | ||
run: yarn config set network-timeout 600000 -g | ||
|
@@ -1452,15 +1453,6 @@ jobs: | |
with: | ||
python-version: '3.8.10' | ||
|
||
- name: Setup Node | ||
uses: actions/setup-node@v4 | ||
with: | ||
node-version: ${{ matrix.node }} | ||
|
||
- name: Install Dependencies | ||
if: steps.restore-dependencies.outputs.cache-hit != 'true' | ||
run: yarn install --frozen-lockfile --ignore-engines --ignore-scripts | ||
|
||
- name: Setup (arm64| ${{ contains(matrix.container, 'alpine') && 'musl' || 'glibc' }}) | ||
if: matrix.arch == 'arm64' && !contains(matrix.container, 'alpine') && matrix.target_platform != 'darwin' | ||
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
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
4 changes: 4 additions & 0 deletions
4
dev-packages/browser-integration-tests/suites/feedback/captureFeedbackCsp/subject.js
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 |
---|---|---|
@@ -0,0 +1,4 @@ | ||
window.__CSPVIOLATION__ = false; | ||
document.addEventListener('securitypolicyviolation', () => { | ||
window.__CSPVIOLATION__ = true; | ||
}); |
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
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
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
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,5 +1,5 @@ | ||
{ | ||
"$schema": "node_modules/lerna/schemas/lerna-schema.json", | ||
"version": "8.26.0", | ||
"version": "8.27.0", | ||
"npmClient": "yarn" | ||
} |
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
Oops, something went wrong.