From 2d61b53a949dcce344a86d1a41c04e6d07e5551d Mon Sep 17 00:00:00 2001 From: AtofStryker Date: Tue, 19 Nov 2024 15:41:20 -0500 Subject: [PATCH 1/2] toss this commit --- .circleci/workflows.yml | 60 ++--------------------------------------- 1 file changed, 2 insertions(+), 58 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 1e29a0dc3da1..b9ef3b9550fb 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -42,7 +42,7 @@ macWorkflowFilters: &darwin-workflow-filters - equal: [ develop, << pipeline.git.branch >> ] # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - - equal: [ 'breaking/remove_react_16_17_merge_react18_harness_upstream', << pipeline.git.branch >> ] + - equal: [ 'chore/diagnose_build', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -3557,44 +3557,6 @@ darwin-arm64-workflow: &darwin-arm64-workflow resource_class: cypress-io/m1-macstadium only-cache-for-root-user: true - - build: - name: darwin-arm64-build - executor: darwin-arm64 - resource_class: cypress-io/m1-macstadium - requires: - - darwin-arm64-node-modules-install - - - create-build-artifacts: - name: darwin-arm64-create-build-artifacts - context: - - test-runner:sign-mac-binary - - test-runner:upload - - test-runner:commit-status-checks - - test-runner:build-binary - executor: darwin-arm64 - resource_class: cypress-io/m1-macstadium - requires: - - darwin-arm64-build - - - v8-integration-tests: - name: darwin-arm64-v8-integration-tests - executor: darwin-arm64 - resource_class: cypress-io/m1-macstadium - requires: - - darwin-arm64-build - - driver-integration-memory-tests: - name: darwin-arm64-driver-integration-memory-tests - executor: darwin-arm64 - resource_class: cypress-io/m1-macstadium - requires: - - darwin-arm64-build - - server-unit-tests-cloud-environment: - name: darwin-arm64-server-unit-tests-cloud-environment - executor: darwin-arm64 - resource_class: cypress-io/m1-macstadium - requires: - - darwin-arm64-build - windows-workflow: &windows-workflow jobs: - node_modules_install: @@ -3673,24 +3635,6 @@ windows-workflow: &windows-workflow - windows-build workflows: - linux-x64: - <<: *linux-x64-workflow - <<: *linux-x64-workflow-exclude-filters - linux-x64-contributor: - <<: *linux-x64-contributor-workflow - when: - matches: - pattern: /^pull\/[0-9]+/ - value: << pipeline.git.branch >> - linux-arm64: - <<: *linux-arm64-workflow - <<: *linux-arm64-workflow-filters - darwin-x64: - <<: *darwin-x64-workflow - <<: *darwin-workflow-filters darwin-arm64: <<: *darwin-arm64-workflow - <<: *darwin-workflow-filters - windows: - <<: *windows-workflow - <<: *windows-workflow-filters + <<: *darwin-workflow-filters \ No newline at end of file From 8396357135720ad59d4e829ffe2ba756b6560c30 Mon Sep 17 00:00:00 2001 From: AtofStryker Date: Tue, 19 Nov 2024 15:42:04 -0500 Subject: [PATCH 2/2] only checkout [run ci] --- .circleci/workflows.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index b9ef3b9550fb..d609cbd8c18b 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -1374,20 +1374,7 @@ jobs: steps: - update_known_hosts - checkout - - install-required-node - - verify-build-setup: - executor: << parameters.executor >> - - persist_to_workspace: - root: ~/ - paths: - - cypress - - .ssh - - .nvm # mac / linux - - ProgramData/nvm # windows - - caching-dependency-installer: - only-cache-for-root-user: <> - build-better-sqlite3: <> - - store-npm-logs + # are the keys deleted after checkout? ## restores node_modules from previous step & builds if first step skipped build: