diff options
Diffstat (limited to 'testing/web-platform/tests/tools/ci')
9 files changed, 53 insertions, 53 deletions
diff --git a/testing/web-platform/tests/tools/ci/azure/install_chrome.yml b/testing/web-platform/tests/tools/ci/azure/install_chrome.yml index 7599321be2..2dde99286c 100644 --- a/testing/web-platform/tests/tools/ci/azure/install_chrome.yml +++ b/testing/web-platform/tests/tools/ci/azure/install_chrome.yml @@ -1,11 +1,11 @@ steps: # The conflicting google-chrome and chromedriver casks are first uninstalled. -# The raw google-chrome-dev cask URL is used to bypass caching. +# The raw google-chrome@dev.rb cask URL is used to bypass caching. - script: | set -eux -o pipefail HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --cask google-chrome || true HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --cask chromedriver || true - curl https://raw.githubusercontent.com/Homebrew/homebrew-cask-versions/master/Casks/google-chrome-dev.rb > google-chrome-dev.rb - HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask google-chrome-dev.rb + curl https://raw.githubusercontent.com/Homebrew/homebrew-cask/HEAD/Casks/g/google-chrome@dev.rb > google-chrome@dev.rb + HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask google-chrome@dev.rb displayName: 'Install Chrome Dev' condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin')) diff --git a/testing/web-platform/tests/tools/ci/azure/install_firefox.yml b/testing/web-platform/tests/tools/ci/azure/install_firefox.yml index 73af597665..d43e28b274 100644 --- a/testing/web-platform/tests/tools/ci/azure/install_firefox.yml +++ b/testing/web-platform/tests/tools/ci/azure/install_firefox.yml @@ -1,9 +1,8 @@ steps: -# This is equivalent to `Homebrew/homebrew-cask-versions/firefox-nightly`, -# but the raw URL is used to bypass caching. +# The raw firefox@nightly.rb cask URL is used to bypass caching. - script: | set -eux -o pipefail - curl https://raw.githubusercontent.com/Homebrew/homebrew-cask-versions/master/Casks/firefox-nightly.rb > firefox-nightly.rb - HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask firefox-nightly.rb + curl https://raw.githubusercontent.com/Homebrew/homebrew-cask/HEAD/Casks/f/firefox@nightly.rb > firefox@nightly.rb + HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask firefox@nightly.rb displayName: 'Install Firefox Nightly' condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin')) diff --git a/testing/web-platform/tests/tools/ci/jobs.py b/testing/web-platform/tests/tools/ci/jobs.py index 44de9fe1ad..fe8eaae069 100644 --- a/testing/web-platform/tests/tools/ci/jobs.py +++ b/testing/web-platform/tests/tools/ci/jobs.py @@ -23,7 +23,7 @@ EXCLUDES = [ ] # Rules are just regex on the path, with a leading ! indicating a regex that must not -# match for the job. Paths should be kept in sync with update-built-tests.sh. +# match for the job. Paths should be kept in sync with scripts in update_built.py. job_path_map = { "affected_tests": [".*/.*", "!resources/(?!idlharness.js)"] + EXCLUDES, "stability": [".*/.*", "!resources/.*"] + EXCLUDES, @@ -32,10 +32,11 @@ job_path_map = { "resources_unittest": ["resources/", "tools/"], "tools_unittest": ["tools/"], "wptrunner_unittest": ["tools/"], - "update_built": ["update-built-tests\\.sh", - "conformance-checkers/", + "update_built": ["conformance-checkers/", + "css/css-images/", "css/css-ui/", "css/css-writing-modes/", + "fetch/metadata/", "html/", "infrastructure/", "mimesniff/"], diff --git a/testing/web-platform/tests/tools/ci/requirements_build.txt b/testing/web-platform/tests/tools/ci/requirements_build.txt index 54f21efbd9..7b4f8619b2 100644 --- a/testing/web-platform/tests/tools/ci/requirements_build.txt +++ b/testing/web-platform/tests/tools/ci/requirements_build.txt @@ -1,5 +1,5 @@ -cairocffi==1.6.1 -fonttools==4.47.2 +cairocffi==1.7.0 +fonttools==4.51.0 genshi==0.7.7 jinja2==3.1.3 pyyaml==6.0.1 diff --git a/testing/web-platform/tests/tools/ci/requirements_macos_color_profile.txt b/testing/web-platform/tests/tools/ci/requirements_macos_color_profile.txt index 7505a98d9f..8e178d1d2c 100644 --- a/testing/web-platform/tests/tools/ci/requirements_macos_color_profile.txt +++ b/testing/web-platform/tests/tools/ci/requirements_macos_color_profile.txt @@ -1,4 +1,4 @@ -pyobjc-core==9.2 +pyobjc-core==10.2 pyobjc-framework-Cocoa==9.2 pyobjc-framework-ColorSync==9.2 pyobjc-framework-Quartz==9.2 diff --git a/testing/web-platform/tests/tools/ci/requirements_tc.txt b/testing/web-platform/tests/tools/ci/requirements_tc.txt index e1ae4dbf70..aa57643b9b 100644 --- a/testing/web-platform/tests/tools/ci/requirements_tc.txt +++ b/testing/web-platform/tests/tools/ci/requirements_tc.txt @@ -1,4 +1,4 @@ -pygithub==2.2.0 +pygithub==2.3.0 pyyaml==6.0.1 requests==2.31.0 -taskcluster==60.4.1 +taskcluster==64.2.7 diff --git a/testing/web-platform/tests/tools/ci/tc/tasks/test.yml b/testing/web-platform/tests/tools/ci/tc/tasks/test.yml index c172e6b731..a9ca07c6ce 100644 --- a/testing/web-platform/tests/tools/ci/tc/tasks/test.yml +++ b/testing/web-platform/tests/tools/ci/tc/tasks/test.yml @@ -115,25 +115,24 @@ components: chunks-override: testharness: 24 - tox-python3_7: + tox-python3_8: env: - TOXENV: py37 + TOXENV: py38 PY_COLORS: "0" install: - - python3.7 - - python3.7-distutils - - python3.7-dev - - python3.7-venv + - python3.8 + - python3.8-distutils + - python3.8-dev + - python3.8-venv - tox-python3_11: + tox-python3_12: env: - TOXENV: py311 + TOXENV: py312 PY_COLORS: "0" install: - - python3.11 - - python3.11-distutils - - python3.11-dev - - python3.11-venv + - python3.12 + - python3.12-dev + - python3.12-venv tests-affected: options: browser: @@ -438,13 +437,13 @@ tasks: - update_built command: "./tools/ci/ci_built_diff.sh" - - tools/ unittests (Python 3.7): + - tools/ unittests (Python 3.8): description: >- - Unit tests for tools running under Python 3.7, excluding wptrunner + Unit tests for tools running under Python 3.8, excluding wptrunner use: - wpt-base - trigger-pr - - tox-python3_7 + - tox-python3_8 command: ./tools/ci/ci_tools_unittest.sh env: HYPOTHESIS_PROFILE: ci @@ -452,13 +451,13 @@ tasks: run-job: - tools_unittest - - tools/ unittests (Python 3.11): + - tools/ unittests (Python 3.12): description: >- - Unit tests for tools running under Python 3.11, excluding wptrunner + Unit tests for tools running under Python 3.12, excluding wptrunner use: - wpt-base - trigger-pr - - tox-python3_11 + - tox-python3_12 command: ./tools/ci/ci_tools_unittest.sh env: HYPOTHESIS_PROFILE: ci @@ -466,13 +465,13 @@ tasks: run-job: - tools_unittest - - tools/ integration tests (Python 3.7): + - tools/ integration tests (Python 3.8): description: >- - Integration tests for tools running under Python 3.7 + Integration tests for tools running under Python 3.8 use: - wpt-base - trigger-pr - - tox-python3_7 + - tox-python3_8 command: ./tools/ci/ci_tools_integration_test.sh install: - libnss3-tools @@ -488,13 +487,13 @@ tasks: run-job: - wpt_integration - - tools/ integration tests (Python 3.11): + - tools/ integration tests (Python 3.12): description: >- - Integration tests for tools running under Python 3.11 + Integration tests for tools running under Python 3.12 use: - wpt-base - trigger-pr - - tox-python3_11 + - tox-python3_12 command: ./tools/ci/ci_tools_integration_test.sh install: - libnss3-tools @@ -510,13 +509,13 @@ tasks: run-job: - wpt_integration - - resources/ tests (Python 3.7): + - resources/ tests (Python 3.8): description: >- - Tests for testharness.js and other files in resources/ under Python 3.7 + Tests for testharness.js and other files in resources/ under Python 3.8 use: - wpt-base - trigger-pr - - tox-python3_7 + - tox-python3_8 command: ./tools/ci/ci_resources_unittest.sh install: - libnss3-tools @@ -529,13 +528,13 @@ tasks: run-job: - resources_unittest - - resources/ tests (Python 3.11): + - resources/ tests (Python 3.12): description: >- - Tests for testharness.js and other files in resources/ under Python 3.11 + Tests for testharness.js and other files in resources/ under Python 3.12 use: - wpt-base - trigger-pr - - tox-python3_11 + - tox-python3_12 command: ./tools/ci/ci_resources_unittest.sh install: - libnss3-tools diff --git a/testing/web-platform/tests/tools/ci/tc/tests/test_valid.py b/testing/web-platform/tests/tools/ci/tc/tests/test_valid.py index 62bb09a1c3..dd8d732654 100644 --- a/testing/web-platform/tests/tools/ci/tc/tests/test_valid.py +++ b/testing/web-platform/tests/tools/ci/tc/tests/test_valid.py @@ -202,12 +202,12 @@ def test_verify_payload(): 'lint']), ("pr_event.json", True, {".taskcluster.yml", ".travis.yml", "tools/ci/start.sh"}, ['lint', - 'tools/ unittests (Python 3.7)', - 'tools/ unittests (Python 3.11)', - 'tools/ integration tests (Python 3.7)', - 'tools/ integration tests (Python 3.11)', - 'resources/ tests (Python 3.7)', - 'resources/ tests (Python 3.11)', + 'tools/ unittests (Python 3.8)', + 'tools/ unittests (Python 3.12)', + 'tools/ integration tests (Python 3.8)', + 'tools/ integration tests (Python 3.12)', + 'resources/ tests (Python 3.8)', + 'resources/ tests (Python 3.12)', 'download-firefox-nightly', 'infrastructure/ tests', 'sink-task']), @@ -224,8 +224,8 @@ def test_verify_payload(): 'sink-task']), ("pr_event_tests_affected.json", True, {"resources/testharness.js"}, ['lint', - 'resources/ tests (Python 3.7)', - 'resources/ tests (Python 3.11)', + 'resources/ tests (Python 3.8)', + 'resources/ tests (Python 3.12)', 'download-firefox-nightly', 'infrastructure/ tests', 'sink-task']), diff --git a/testing/web-platform/tests/tools/ci/update_built.py b/testing/web-platform/tests/tools/ci/update_built.py index 8e0f18589d..929b09f9fe 100644 --- a/testing/web-platform/tests/tools/ci/update_built.py +++ b/testing/web-platform/tests/tools/ci/update_built.py @@ -9,6 +9,7 @@ logger = logging.getLogger() wpt_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir)) +# These paths should be kept in sync with job_path_map in jobs.py. scripts = { "canvas": ["html/canvas/tools/gentest.py"], "conformance-checkers": ["conformance-checkers/tools/dl.py", |