From 6aa20f657b255dbd4f7aa7b77b6939e48b957f84 Mon Sep 17 00:00:00 2001 From: Steven Lambert Date: Wed, 30 Mar 2022 08:23:53 -0600 Subject: [PATCH 1/5] ci: fix nightly build --- .circleci/config.yml | 196 +++++++++++++++++++++++-------------------- 1 file changed, 103 insertions(+), 93 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d886b6ee7..0d9f8aaaa6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -178,9 +178,9 @@ jobs: <<: *defaults <<: *unix_nightly_box steps: - - browser-tools/install-browser-tools - checkout - <<: *restore_dependency_cache_unix + - browser-tools/install-browser-tools - run: npm run build # install ACT rules - run: npm install act-rules/act-rules.github.io#master @@ -191,9 +191,9 @@ jobs: <<: *defaults <<: *unix_nightly_box steps: - - browser-tools/install-browser-tools - checkout - <<: *restore_dependency_cache_unix + - browser-tools/install-browser-tools - run: npm run build # install ARIA practices - run: npm install w3c/aria-practices#main @@ -291,104 +291,114 @@ workflows: version: 2 build: jobs: - # install deps - dependencies_unix - - dependencies_win - # Run linting - - lint: + - test_nightly_browsers: requires: - dependencies_unix - # Run tests on all commits, but after installing dependencies - - test_unix: - requires: - - lint - # Run IE/ Windows test on all commits - - test_win: - requires: - - dependencies_win - - test_examples: - requires: - - test_unix - - test_act: - requires: - - test_unix - - test_aria_practices: - requires: - - test_unix - - test_locales: - requires: - - test_unix - - test_virtual_rules: - requires: - - test_unix - - build_api_docs: - requires: - - test_unix - - test_rule_help_version: - requires: - - test_unix - - test_node: - requires: - - test_unix - # Hold for approval - - hold: - type: approval - requires: - - test_unix - - test_win - - test_examples - - test_locales - - test_virtual_rules - - build_api_docs - - test_rule_help_version - - test_node - filters: - branches: - only: - - master - # Run a next release on "develop" commits, but only after the tests pass and dependencies are installed - - next_release: + - test_nightly_act: requires: - dependencies_unix - - test_unix - - test_examples - - test_locales - - test_virtual_rules - - build_api_docs - filters: - branches: - only: develop - # Run a production release on "master" commits, but only after the tests pass and dependencies are installed - - release: + - test_nightly_aria_practices: requires: - dependencies_unix - - test_unix - - test_examples - - test_locales - - test_virtual_rules - - build_api_docs - - test_rule_help_version - - test_node - - hold - filters: - branches: - only: master - # Verify releases have all required files - - verify_release: - requires: - - release - filters: - branches: - only: master - - verify_next_release: - requires: - - next_release - filters: - branches: - only: develop - - github_release: - requires: - - release + # # install deps + # - dependencies_unix + # - dependencies_win + # # Run linting + # - lint: + # requires: + # - dependencies_unix + # # Run tests on all commits, but after installing dependencies + # - test_unix: + # requires: + # - lint + # # Run IE/ Windows test on all commits + # - test_win: + # requires: + # - dependencies_win + # - test_examples: + # requires: + # - test_unix + # - test_act: + # requires: + # - test_unix + # - test_aria_practices: + # requires: + # - test_unix + # - test_locales: + # requires: + # - test_unix + # - test_virtual_rules: + # requires: + # - test_unix + # - build_api_docs: + # requires: + # - test_unix + # - test_rule_help_version: + # requires: + # - test_unix + # - test_node: + # requires: + # - test_unix + # # Hold for approval + # - hold: + # type: approval + # requires: + # - test_unix + # - test_win + # - test_examples + # - test_locales + # - test_virtual_rules + # - build_api_docs + # - test_rule_help_version + # - test_node + # filters: + # branches: + # only: + # - master + # # Run a next release on "develop" commits, but only after the tests pass and dependencies are installed + # - next_release: + # requires: + # - dependencies_unix + # - test_unix + # - test_examples + # - test_locales + # - test_virtual_rules + # - build_api_docs + # filters: + # branches: + # only: develop + # # Run a production release on "master" commits, but only after the tests pass and dependencies are installed + # - release: + # requires: + # - dependencies_unix + # - test_unix + # - test_examples + # - test_locales + # - test_virtual_rules + # - build_api_docs + # - test_rule_help_version + # - test_node + # - hold + # filters: + # branches: + # only: master + # # Verify releases have all required files + # - verify_release: + # requires: + # - release + # filters: + # branches: + # only: master + # - verify_next_release: + # requires: + # - next_release + # filters: + # branches: + # only: develop + # - github_release: + # requires: + # - release nightly: triggers: - schedule: From 171592884e1bc0e2a730c20fc206061c9d4cba29 Mon Sep 17 00:00:00 2001 From: Steven Lambert Date: Wed, 30 Mar 2022 08:41:18 -0600 Subject: [PATCH 2/5] try again --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0d9f8aaaa6..ed37e159be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,6 +181,7 @@ jobs: - checkout - <<: *restore_dependency_cache_unix - browser-tools/install-browser-tools + - npx browser-driver-manager install chromedriver --verbose - run: npm run build # install ACT rules - run: npm install act-rules/act-rules.github.io#master @@ -194,6 +195,7 @@ jobs: - checkout - <<: *restore_dependency_cache_unix - browser-tools/install-browser-tools + - npx browser-driver-manager install chromedriver --verbose - run: npm run build # install ARIA practices - run: npm install w3c/aria-practices#main From 221d3512da2bd89111ed80dbce6215fbcb6b9f11 Mon Sep 17 00:00:00 2001 From: Steven Lambert Date: Wed, 30 Mar 2022 08:43:10 -0600 Subject: [PATCH 3/5] run --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ed37e159be..024e676228 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,7 +181,7 @@ jobs: - checkout - <<: *restore_dependency_cache_unix - browser-tools/install-browser-tools - - npx browser-driver-manager install chromedriver --verbose + - run: npx browser-driver-manager install chromedriver --verbose - run: npm run build # install ACT rules - run: npm install act-rules/act-rules.github.io#master @@ -195,7 +195,7 @@ jobs: - checkout - <<: *restore_dependency_cache_unix - browser-tools/install-browser-tools - - npx browser-driver-manager install chromedriver --verbose + - run: npx browser-driver-manager install chromedriver --verbose - run: npm run build # install ARIA practices - run: npm install w3c/aria-practices#main From 8d0474dde2815a04853890694491591ca2425524 Mon Sep 17 00:00:00 2001 From: Steven Lambert Date: Fri, 8 Apr 2022 08:49:17 -0600 Subject: [PATCH 4/5] fix it? --- .circleci/config.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 024e676228..5489831052 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,11 +181,13 @@ jobs: - checkout - <<: *restore_dependency_cache_unix - browser-tools/install-browser-tools - - run: npx browser-driver-manager install chromedriver --verbose - - run: npm run build # install ACT rules + # install first as for some reason installing a single package + # also re-installs all repo dependencies as well - run: npm install act-rules/act-rules.github.io#master - - run: npm run test:apg + - run: npx browser-driver-manager install chromedriver --verbose + - run: npm run build + - run: npm run test:act # Run the test suite for nightly builds. test_nightly_aria_practices: @@ -195,10 +197,12 @@ jobs: - checkout - <<: *restore_dependency_cache_unix - browser-tools/install-browser-tools - - run: npx browser-driver-manager install chromedriver --verbose - - run: npm run build # install ARIA practices + # install first as for some reason installing a single package + # also re-installs all repo dependencies as well - run: npm install w3c/aria-practices#main + - run: npx browser-driver-manager install chromedriver --verbose + - run: npm run build - run: npm run test:apg # Test api docs can be built From b832b999e641f51dee1a551bab3e34152b681620 Mon Sep 17 00:00:00 2001 From: Steven Lambert Date: Fri, 8 Apr 2022 08:57:44 -0600 Subject: [PATCH 5/5] revert workflow --- .circleci/config.yml | 194 ++++++++++++++++++++----------------------- 1 file changed, 92 insertions(+), 102 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5489831052..69d99aa925 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -297,114 +297,104 @@ workflows: version: 2 build: jobs: + # install deps - dependencies_unix - - test_nightly_browsers: + - dependencies_win + # Run linting + - lint: requires: - dependencies_unix - - test_nightly_act: + # Run tests on all commits, but after installing dependencies + - test_unix: + requires: + - lint + # Run IE/ Windows test on all commits + - test_win: + requires: + - dependencies_win + - test_examples: + requires: + - test_unix + - test_act: + requires: + - test_unix + - test_aria_practices: + requires: + - test_unix + - test_locales: + requires: + - test_unix + - test_virtual_rules: + requires: + - test_unix + - build_api_docs: + requires: + - test_unix + - test_rule_help_version: + requires: + - test_unix + - test_node: + requires: + - test_unix + # Hold for approval + - hold: + type: approval + requires: + - test_unix + - test_win + - test_examples + - test_locales + - test_virtual_rules + - build_api_docs + - test_rule_help_version + - test_node + filters: + branches: + only: + - master + # Run a next release on "develop" commits, but only after the tests pass and dependencies are installed + - next_release: requires: - dependencies_unix - - test_nightly_aria_practices: + - test_unix + - test_examples + - test_locales + - test_virtual_rules + - build_api_docs + filters: + branches: + only: develop + # Run a production release on "master" commits, but only after the tests pass and dependencies are installed + - release: requires: - dependencies_unix - # # install deps - # - dependencies_unix - # - dependencies_win - # # Run linting - # - lint: - # requires: - # - dependencies_unix - # # Run tests on all commits, but after installing dependencies - # - test_unix: - # requires: - # - lint - # # Run IE/ Windows test on all commits - # - test_win: - # requires: - # - dependencies_win - # - test_examples: - # requires: - # - test_unix - # - test_act: - # requires: - # - test_unix - # - test_aria_practices: - # requires: - # - test_unix - # - test_locales: - # requires: - # - test_unix - # - test_virtual_rules: - # requires: - # - test_unix - # - build_api_docs: - # requires: - # - test_unix - # - test_rule_help_version: - # requires: - # - test_unix - # - test_node: - # requires: - # - test_unix - # # Hold for approval - # - hold: - # type: approval - # requires: - # - test_unix - # - test_win - # - test_examples - # - test_locales - # - test_virtual_rules - # - build_api_docs - # - test_rule_help_version - # - test_node - # filters: - # branches: - # only: - # - master - # # Run a next release on "develop" commits, but only after the tests pass and dependencies are installed - # - next_release: - # requires: - # - dependencies_unix - # - test_unix - # - test_examples - # - test_locales - # - test_virtual_rules - # - build_api_docs - # filters: - # branches: - # only: develop - # # Run a production release on "master" commits, but only after the tests pass and dependencies are installed - # - release: - # requires: - # - dependencies_unix - # - test_unix - # - test_examples - # - test_locales - # - test_virtual_rules - # - build_api_docs - # - test_rule_help_version - # - test_node - # - hold - # filters: - # branches: - # only: master - # # Verify releases have all required files - # - verify_release: - # requires: - # - release - # filters: - # branches: - # only: master - # - verify_next_release: - # requires: - # - next_release - # filters: - # branches: - # only: develop - # - github_release: - # requires: - # - release + - test_unix + - test_examples + - test_locales + - test_virtual_rules + - build_api_docs + - test_rule_help_version + - test_node + - hold + filters: + branches: + only: master + # Verify releases have all required files + - verify_release: + requires: + - release + filters: + branches: + only: master + - verify_next_release: + requires: + - next_release + filters: + branches: + only: develop + - github_release: + requires: + - release nightly: triggers: - schedule: @@ -424,4 +414,4 @@ workflows: - dependencies_unix - test_nightly_aria_practices: requires: - - dependencies_unix + - dependencies_unix \ No newline at end of file