From c78fd42b859c62eb23353b32b5ea57d75b49f1fe Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 11 Dec 2024 12:42:29 -0600 Subject: [PATCH 1/3] chore: update dependencies to resolve yarn versioning issue --- .circleci/workflows.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 109dd3d2378e..5dcc5061e471 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -30,7 +30,7 @@ mainBuildFilters: &mainBuildFilters - /^release\/\d+\.\d+\.\d+$/ # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - 'update-v8-snapshot-cache-on-develop' - - 'chore/update_reporter_mobx' + - 'ryanm/chore/fix-yarn-issue' - 'publish-binary' # usually we don't build Mac app - it takes a long time @@ -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: [ 'ryanm/experiment/esm', << pipeline.git.branch >> ] + - equal: [ 'ryanm/chore/fix-yarn-issue', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -53,7 +53,7 @@ linuxArm64WorkflowFilters: &linux-arm64-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: [ 'chore/update_reporter_mobx', << pipeline.git.branch >> ] + - equal: [ 'ryanm/chore/fix-yarn-issue', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -76,7 +76,7 @@ windowsWorkflowFilters: &windows-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: [ 'chore/update_reporter_mobx', << pipeline.git.branch >> ] + - equal: [ 'ryanm/chore/fix-yarn-issue', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -136,7 +136,7 @@ executors: linux-arm64: &linux-arm64-executor machine: - image: ubuntu-2004:2023.07.1 + image: ubuntu-2004:2024.11.1 resource_class: arm.medium environment: PLATFORM: linux @@ -1772,7 +1772,7 @@ jobs: PLATFORM: linux machine: # using `machine` gives us a Linux VM that can run Docker - image: ubuntu-2004:202111-02 + image: ubuntu-2004:2024.11.1 docker_layer_caching: true resource_class: medium steps: From 1d0c953e563688ee940c2fb7755002ae5e96f644 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 11 Dec 2024 13:30:13 -0600 Subject: [PATCH 2/3] bump cache --- .circleci/cache-version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt index 1dd4a2276a03..f82a827eb247 100644 --- a/.circleci/cache-version.txt +++ b/.circleci/cache-version.txt @@ -1,3 +1,3 @@ # Bump this version to force CI to re-create the cache from scratch. -11-5-24 +12-11-24 From 74475e4e3453407345e4f067f47a632fcc8e9c42 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 11 Dec 2024 14:23:25 -0600 Subject: [PATCH 3/3] try to fix build --- .circleci/workflows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 5dcc5061e471..35cd7cd41317 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -136,7 +136,7 @@ executors: linux-arm64: &linux-arm64-executor machine: - image: ubuntu-2004:2024.11.1 + image: ubuntu-2004:2023.07.1 resource_class: arm.medium environment: PLATFORM: linux @@ -1772,7 +1772,7 @@ jobs: PLATFORM: linux machine: # using `machine` gives us a Linux VM that can run Docker - image: ubuntu-2004:2024.11.1 + image: ubuntu-2004:2023.07.1 docker_layer_caching: true resource_class: medium steps: