From 9420df9e809128c5a53ffca583a4d66ee1d48b18 Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Tue, 25 Feb 2025 10:33:05 +0000 Subject: [PATCH 1/2] Increase timeout --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 65803aea49..d1fe64ec1e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ default_docker_image: &docker_image PHP_EXTENSIONS: "gd" PHP_INI_MEMORY_LIMIT: -1 PHP_INI_MAX_EXECUTION_TIME: 60 - PHP_INI_MAX_INPUT_TIME: 60 + PHP_INI_MAX_INPUT_TIME: 600 CPPFLAGS: "-DPNG_ARM_NEON_OPT=0" # Re-usable commands. From 2c9001e92837e9492ddfcfcad224d69e269e5781 Mon Sep 17 00:00:00 2001 From: DuttonMa Date: Tue, 25 Feb 2025 10:34:29 +0000 Subject: [PATCH 2/2] Rerun edge build --- .circleci/config.yml | 52 +++----------------------------------------- 1 file changed, 3 insertions(+), 49 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d1fe64ec1e..6d5277c500 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -295,55 +295,9 @@ jobs: workflows: version: 2 - build-test-deploy: - jobs: - - build - - unity_base_checks: - requires: - - build - - coding_standards: - requires: - - build - - deprecated_code: - requires: - - build - - disallowed_functions: - requires: - - build - - check_illegal_updates: - requires: - - build - - # A nightly build of the project, using all dof-dss packages at HEAD from development branch. nightly-edge-build: - when: - and: - - not: - equal: [ "https://github.com/dof-dss/unity_base", << pipeline.project.git_url >> ] - triggers: - - schedule: - # At 00:30 Monday to Friday - cron: "30 0 * * 1-5" - filters: - branches: - only: - - development jobs: - edge_build - - # A nightly deploy or re-deploy of the edge site after the git branch has been created in nightly-edge-build. - nightly-edge-build-post-build-tasks: - when: - and: - - not: - equal: [ "https://github.com/dof-dss/unity_base", << pipeline.project.git_url >> ] - triggers: - - schedule: - # At 01:23 Monday to Friday - cron: "55 1 * * 1-5" - filters: - branches: - only: - - edge - jobs: - - sync_data + - sync_data: + requires: + - edge_build