-
Notifications
You must be signed in to change notification settings - Fork 779
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dequelabs:develop' into develop
- Loading branch information
Showing
17 changed files
with
720 additions
and
917 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 |
---|---|---|
|
@@ -13,11 +13,11 @@ unix_nightly_box: &unix_nightly_box | |
|
||
win_box: &win_box | ||
executor: | ||
name: win/vs2019 | ||
name: win/default | ||
shell: bash.exe | ||
|
||
orbs: | ||
win: circleci/windows@1.0.0 | ||
win: circleci/windows@2.2.0 | ||
puppeteer: threetreeslight/[email protected] | ||
browser-tools: circleci/[email protected] | ||
|
||
|
@@ -36,20 +36,6 @@ restore_dependency_cache_win: &restore_dependency_cache_win | |
- v9-cache-win-{{ checksum "package-lock.json" }} | ||
- v9-cache-win- | ||
|
||
# install the version of chromedriver that matches the currently installed version of Chrome (taken from CircleCI chromedriver script) | ||
install_linux_chromedriver: &install_linux_chromedriver | ||
run: | ||
name: Install Chromedriver | ||
command: | | ||
CHROME_VERSION="$(google-chrome --version)" | ||
CHROME_VERSION_STRING="$(echo $CHROME_VERSION | sed 's/^Google Chrome //' | sed 's/^Chromium //')" | ||
echo "Installed version of Google Chrome is $CHROME_VERSION_STRING" | ||
CHROMEDRIVER_RELEASE="${CHROME_VERSION_STRING%%.*}" | ||
echo "ChromeDriver $CHROMEDRIVER_RELEASE will be installed" | ||
npm install --no-save "chromedriver@$CHROMEDRIVER_RELEASE" | ||
jobs: | ||
# Fetch and cache dependencies. | ||
dependencies_unix: | ||
|
@@ -60,7 +46,7 @@ jobs: | |
- <<: *set_npm_auth | ||
- <<: *restore_dependency_cache_unix | ||
- run: npm ci | ||
- <<: *install_linux_chromedriver | ||
- run: npx browser-driver-manager install chromedriver --verbose | ||
- save_cache: | ||
key: v9-cache-unix-{{ checksum "package-lock.json" }} | ||
paths: | ||
|
@@ -177,11 +163,8 @@ jobs: | |
- <<: *restore_dependency_cache_unix | ||
- run: npm run build | ||
- run: | ||
name: Install Chrome Beta | ||
command: | | ||
wget https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb | ||
sudo apt install ./google-chrome-beta_current_amd64.deb | ||
- <<: *install_linux_chromedriver | ||
name: Install Chrome and ChromeDriver Beta | ||
command: npx browser-driver-manager install chrome=beta chromedriver=beta --verbose | ||
- run: | ||
name: Install Firefox Nightly | ||
command: | | ||
|
@@ -411,4 +394,4 @@ workflows: | |
- dependencies_unix | ||
- test_nightly_aria_practices: | ||
requires: | ||
- dependencies_unix | ||
- dependencies_unix |
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,6 +1,6 @@ | ||
{ | ||
"name": "axe-core", | ||
"version": "4.3.5", | ||
"version": "4.4.1", | ||
"contributors": [ | ||
{ | ||
"name": "David Sturley", | ||
|
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.