Browse Source

devops: migrate from master to main branch (#10303)

pull/10789/head
Max Schmitt 2 months ago
committed by GitHub
parent
commit
5ba7903ba0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .github/workflows/infra.yml
  2. 2
      .github/workflows/pr_check_client_side_changes.yml
  3. 6
      .github/workflows/publish_canary.yml
  4. 2
      .github/workflows/roll_browser_into_playwright.yml
  5. 2
      .github/workflows/roll_chromium_build.yml
  6. 4
      .github/workflows/tests_docker.yml
  7. 2
      .github/workflows/tests_fyi.yml
  8. 4
      .github/workflows/tests_primary.yml
  9. 4
      .github/workflows/tests_secondary.yml
  10. 4
      .github/workflows/trigger_build_chromium.yml
  11. 2
      .github/workflows/trigger_build_chromium_with_symbols.yml
  12. 2
      .github/workflows/trigger_build_deprecated_webkit_mac_10.14.yml
  13. 2
      .github/workflows/trigger_build_ffmpeg.yml
  14. 2
      .github/workflows/trigger_build_firefox.yml
  15. 2
      .github/workflows/trigger_build_firefox_beta.yml
  16. 2
      .github/workflows/trigger_build_webkit.yml
  17. 2
      .github/workflows/trigger_build_winldd.yml
  18. 2
      .github/workflows/trigger_tests.yml
  19. 6
      CONTRIBUTING.md
  20. 2
      docs/development/releasing.md
  21. 2
      docs/src/ci.md
  22. 4
      docs/src/docker.md
  23. 2
      docs/src/release-notes-js.md
  24. 2
      packages/playwright-core/src/server/chromium/chromium.ts
  25. 2
      utils/upload_flakiness_dashboard.sh

4
.github/workflows/infra.yml

@ -3,11 +3,11 @@ name: "infra"
on:
push:
branches:
- master
- main
- release-*
pull_request:
branches:
- master
- main
- release-*
jobs:

2
.github/workflows/pr_check_client_side_changes.yml

@ -2,7 +2,7 @@ name: "Check client side changes"
on:
push:
branches:
- master
- main
paths:
- 'packages/playwright-core/src/client/**/*'
jobs:

6
.github/workflows/publish_canary.yml

@ -24,14 +24,14 @@ jobs:
- run: npm run build
- run: npx playwright install-deps
- name: "@next: publish with commit timestamp (triggered manually)"
if: contains(github.ref, 'master') && github.event_name == 'workflow_dispatch'
if: contains(github.ref, 'main') && github.event_name == 'workflow_dispatch'
run: |
node utils/build/update_canary_version.js --alpha --commit-timestamp
utils/publish_all_packages.sh --alpha
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: "@next: publish with today's date (triggered automatically)"
if: contains(github.ref, 'master') && github.event_name != 'workflow_dispatch'
if: contains(github.ref, 'main') && github.event_name != 'workflow_dispatch'
run: |
node utils/build/update_canary_version.js --alpha --today-date
utils/publish_all_packages.sh --alpha
@ -76,7 +76,7 @@ jobs:
- run: npm i -g npm@7
- name: Deploy Canary
run: bash utils/build/deploy-trace-viewer.sh --canary
if: contains(github.ref, 'master')
if: contains(github.ref, 'main')
env:
GH_SERVICE_ACCOUNT_TOKEN: ${{ secrets.GH_SERVICE_ACCOUNT_TOKEN }}
- name: Deploy BETA

2
.github/workflows/roll_browser_into_playwright.yml

@ -41,6 +41,6 @@ jobs:
owner: 'microsoft',
repo: 'playwright',
head: 'microsoft:${{ steps.prepare-branch.outputs.BRANCH_NAME }}',
base: 'master',
base: 'main',
title: 'feat(${{ github.event.client_payload.browser }}): roll to r${{ github.event.client_payload.revision }}',
});

2
.github/workflows/roll_chromium_build.yml

@ -41,7 +41,7 @@ jobs:
owner: 'microsoft',
repo: 'playwright',
head: 'microsoft:${{ steps.prepare-branch.outputs.BRANCH_NAME }}',
base: 'master',
base: 'main',
title: 'browser(chromium): roll to r${{ steps.bump-chromium.outputs.BASE_POSITION }}',
body: 'Upstream commit: https://github.com/chromium/chromium/commit/${{ steps.bump-chromium.outputs.GIT_COMMIT }}',
});

4
.github/workflows/tests_docker.yml

@ -3,7 +3,7 @@ name: "Docker tests"
on:
push:
branches:
- master
- main
- release-*
pull_request:
paths:
@ -12,7 +12,7 @@ on:
- 'browsers.json'
- 'package.json'
branches:
- master
- main
- release-*
env:

2
.github/workflows/tests_fyi.yml

@ -3,7 +3,7 @@ name: "tests 3"
on:
push:
branches:
- master
- main
- release-*
env:

4
.github/workflows/tests_primary.yml

@ -3,14 +3,14 @@ name: "tests 1"
on:
push:
branches:
- master
- main
- release-*
pull_request:
paths-ignore:
- 'browser_patches/**'
- 'docs/**'
branches:
- master
- main
- release-*
env:

4
.github/workflows/tests_secondary.yml

@ -3,7 +3,7 @@ name: "tests 2"
on:
push:
branches:
- master
- main
- release-*
pull_request:
paths-ignore:
@ -11,7 +11,7 @@ on:
- 'docs/**'
types: [ labeled ]
branches:
- master
- main
- release-*
env:

4
.github/workflows/trigger_build_chromium.yml

@ -6,10 +6,10 @@ on:
ref:
description: 'Playwright SHA / ref to build Chromium'
required: true
default: 'master'
default: 'main'
push:
branches:
- master
- main
- release-*
paths:
- browser_patches/chromium/BUILD_NUMBER

2
.github/workflows/trigger_build_chromium_with_symbols.yml

@ -7,7 +7,7 @@ on:
ref:
description: 'Playwright SHA / ref to build Chromium With Symbols'
required: true
default: 'master'
default: 'main'
release:
types: [published]
push:

2
.github/workflows/trigger_build_deprecated_webkit_mac_10.14.yml

@ -3,7 +3,7 @@ name: "Deprecated WebKit Mac 10.14 Builder"
on:
push:
branches:
- master
- main
- release-*
paths:
- browser_patches/depcrecated-webkit-mac-10.14/BUILD_NUMBER

2
.github/workflows/trigger_build_ffmpeg.yml

@ -3,7 +3,7 @@ name: "FFMPEG Builder"
on:
push:
branches:
- master
- main
- release-*
paths:
- browser_patches/ffmpeg/BUILD_NUMBER

2
.github/workflows/trigger_build_firefox.yml

@ -3,7 +3,7 @@ name: "Firefox Builder"
on:
push:
branches:
- master
- main
- release-*
paths:
- browser_patches/firefox/BUILD_NUMBER

2
.github/workflows/trigger_build_firefox_beta.yml

@ -3,7 +3,7 @@ name: "Firefox Beta Builder"
on:
push:
branches:
- master
- main
- release-*
paths:
- browser_patches/firefox-beta/BUILD_NUMBER

2
.github/workflows/trigger_build_webkit.yml

@ -3,7 +3,7 @@ name: "WebKit Builder"
on:
push:
branches:
- master
- main
- release-*
paths:
- browser_patches/webkit/BUILD_NUMBER

2
.github/workflows/trigger_build_winldd.yml

@ -3,7 +3,7 @@ name: "WinLDD Builder"
on:
push:
branches:
- master
- main
- release-*
paths:
- browser_patches/winldd/BUILD_NUMBER

2
.github/workflows/trigger_tests.yml

@ -3,7 +3,7 @@ name: "Internal Tests"
on:
push:
branches:
- master
- main
- release-*
jobs:

6
CONTRIBUTING.md

@ -51,7 +51,7 @@ information on using pull requests.
### Code Style
- Coding style is fully defined in [.eslintrc](https://github.com/microsoft/playwright/blob/master/.eslintrc.js)
- Coding style is fully defined in [.eslintrc](https://github.com/microsoft/playwright/blob/main/.eslintrc.js)
- Comments should be generally avoided. If the code would not be understood without comments, consider re-writing the code to make it self-explanatory.
To run code linter, use:
@ -106,7 +106,7 @@ Fixes #123, fixes #234
### Writing Documentation
All API classes, methods, and events should have a description in [`docs/src`](https://github.com/microsoft/playwright/blob/master/docs/src). There's a [documentation linter](https://github.com/microsoft/playwright/tree/master/utils/doclint) which makes sure documentation is aligned with the codebase.
All API classes, methods, and events should have a description in [`docs/src`](https://github.com/microsoft/playwright/blob/main/docs/src). There's a [documentation linter](https://github.com/microsoft/playwright/tree/main/utils/doclint) which makes sure documentation is aligned with the codebase.
To run the documentation linter, use:
@ -130,7 +130,7 @@ A barrier for introducing new installation dependencies is especially high:
- Tests should be *hermetic*. Tests should not depend on external services.
- Tests should work on all three platforms: Mac, Linux and Win. This is especially important for screenshot tests.
Playwright tests are located in [`tests`](https://github.com/microsoft/playwright/blob/master/tests) and use `@playwright/test` test runner.
Playwright tests are located in [`tests`](https://github.com/microsoft/playwright/blob/main/tests) and use `@playwright/test` test runner.
These are integration tests, making sure public API methods and events work as expected.
- To run all tests:

2
docs/development/releasing.md

@ -3,7 +3,7 @@ Releasing is a 3-step process.
# 1. Create a release branch
1. On your local machine, create a new branch `release-X.Y` based off the "cutting" commit and land a `chore: mark vX.Y.Z` in the local branch:
- `git checkout master`
- `git checkout main`
- `git checkout -b release-X.Y`
- `./utils/update_version.js vX.Y`
- `npm run doc`

2
docs/src/ci.md

@ -74,7 +74,7 @@ steps:
run: pytest
```
We run [our tests](https://github.com/microsoft/playwright/blob/master/.github/workflows/tests_secondary.yml) on GitHub Actions, across a matrix of 3 platforms (Windows, Linux, macOS) and 3 browsers (Chromium, Firefox, WebKit).
We run [our tests](https://github.com/microsoft/playwright/blob/main/.github/workflows/tests_secondary.yml) on GitHub Actions, across a matrix of 3 platforms (Windows, Linux, macOS) and 3 browsers (Chromium, Firefox, WebKit).
### GitHub Actions on deployment

4
docs/src/docker.md

@ -59,7 +59,7 @@ docker run -it --rm --ipc=host --user pwuser --security-opt seccomp=seccomp_prof
docker run -it --rm --ipc=host --user pwuser --security-opt seccomp=seccomp_profile.json mcr.microsoft.com/playwright/java:focal /bin/bash
```
[`seccomp_profile.json`](https://github.com/microsoft/playwright/blob/master/utils/docker/seccomp_profile.json) is needed to run Chromium with sandbox. This is a [default Docker seccomp profile](https://github.com/docker/engine/blob/d0d99b04cf6e00ed3fc27e81fc3d94e7eda70af3/profiles/seccomp/default.json) with extra user namespace cloning permissions:
[`seccomp_profile.json`](https://github.com/microsoft/playwright/blob/main/utils/docker/seccomp_profile.json) is needed to run Chromium with sandbox. This is a [default Docker seccomp profile](https://github.com/docker/engine/blob/d0d99b04cf6e00ed3fc27e81fc3d94e7eda70af3/profiles/seccomp/default.json) with extra user namespace cloning permissions:
```json
[
@ -118,7 +118,7 @@ Browser builds for Firefox and WebKit are built for the [glibc](https://en.wikip
### Build the image
Use [`//utils/docker/build.sh`](https://github.com/microsoft/playwright/blob/master/utils/docker/build.sh) to build the image.
Use [`//utils/docker/build.sh`](https://github.com/microsoft/playwright/blob/main/utils/docker/build.sh) to build the image.
```
./utils/docker/build.sh focal playwright:localbuild-focal

2
docs/src/release-notes-js.md

@ -409,7 +409,7 @@ Learn more in the [documentation](./test-advanced#launching-a-development-web-se
#### Playwright Test
- **⚡️ Introducing [Reporter API](https://github.com/microsoft/playwright/blob/master/types/testReporter.d.ts)** which is already used to create an [Allure Playwright reporter](https://github.com/allure-framework/allure-js/pull/297).
- **⚡️ Introducing [Reporter API](https://github.com/microsoft/playwright/blob/65a9037461ffc15d70cdc2055832a0c5512b227c/packages/playwright-test/types/testReporter.d.ts)** which is already used to create an [Allure Playwright reporter](https://github.com/allure-framework/allure-js/pull/297).
- **⛺️ New [`baseURL` fixture](./test-configuration#basic-options)** to support relative paths in tests.

2
packages/playwright-core/src/server/chromium/chromium.ts

@ -129,7 +129,7 @@ export class Chromium extends BrowserType {
`Chromium sandboxing failed!`,
`================================`,
`To workaround sandboxing issues, do either of the following:`,
` - (preferred): Configure environment to support sandboxing: https://github.com/microsoft/playwright/blob/master/docs/troubleshooting.md`,
` - (preferred): Configure environment to support sandboxing: https://playwright.dev/docs/troubleshooting`,
` - (alternative): Launch Chromium without sandbox using 'chromiumSandbox: false' option`,
`================================`,
``,

2
utils/upload_flakiness_dashboard.sh

@ -32,7 +32,7 @@ if [[ ("${GITHUB_REPOSITORY}" != "microsoft/playwright") && ("${GITHUB_REPOSITOR
exit 0
fi
if [[ "${GITHUB_REF}" != "refs/heads/master" && "${GITHUB_REF}" != 'refs/heads/release-'* ]]; then
if [[ "${GITHUB_REF}" != "refs/heads/main" && "${GITHUB_REF}" != 'refs/heads/release-'* ]]; then
echo "NOTE: skipping dashboard uploading from Playwright branches"
exit 0
fi

Loading…
Cancel
Save