Skip to content

Commit 7f6b3ff

Browse files
chore: fix the binary builds due to proxy-from-env -- run ci (#31259)
1 parent e9eccad commit 7f6b3ff

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.circleci/workflows.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ mainBuildFilters: &mainBuildFilters
3636
only:
3737
- develop
3838
- /^release\/\d+\.\d+\.\d+$/
39-
- feat/implement_bidi
39+
- ryanm/chore/fix-binary-due-to-proxy-from-env
4040
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
4141
- 'update-v8-snapshot-cache-on-develop'
4242
- 'ryanm/chore/add_internal_studio'
@@ -50,7 +50,7 @@ macWorkflowFilters: &darwin-workflow-filters
5050
- equal: [ develop, << pipeline.git.branch >> ]
5151
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
5252
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
53-
- equal: [ 'feat/implement_bidi', << pipeline.git.branch >> ]
53+
- equal: [ 'ryanm/chore/fix-binary-due-to-proxy-from-env', << pipeline.git.branch >> ]
5454
- matches:
5555
pattern: /^release\/\d+\.\d+\.\d+$/
5656
value: << pipeline.git.branch >>
@@ -61,7 +61,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
6161
- equal: [ develop, << pipeline.git.branch >> ]
6262
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
6363
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
64-
- equal: [ 'feat/implement_bidi', << pipeline.git.branch >> ]
64+
- equal: [ 'ryanm/chore/fix-binary-due-to-proxy-from-env', << pipeline.git.branch >> ]
6565
- matches:
6666
pattern: /^release\/\d+\.\d+\.\d+$/
6767
value: << pipeline.git.branch >>
@@ -84,7 +84,7 @@ windowsWorkflowFilters: &windows-workflow-filters
8484
- equal: [ develop, << pipeline.git.branch >> ]
8585
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
8686
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
87-
- equal: [ 'mschile/studio/windows_url_fix', << pipeline.git.branch >> ]
87+
- equal: [ 'ryanm/chore/fix-binary-due-to-proxy-from-env', << pipeline.git.branch >> ]
8888
- matches:
8989
pattern: /^release\/\d+\.\d+\.\d+$/
9090
value: << pipeline.git.branch >>
@@ -160,7 +160,7 @@ commands:
160160
name: Set environment variable to determine whether or not to persist artifacts
161161
command: |
162162
echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
163-
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "feat/implement_bidi" ]]; then
163+
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "ryanm/chore/fix-binary-due-to-proxy-from-env" ]]; then
164164
export SHOULD_PERSIST_ARTIFACTS=true
165165
fi' >> "$BASH_ENV"
166166
# You must run `setup_should_persist_artifacts` command and be using bash before running this command
@@ -251,7 +251,7 @@ commands:
251251
command: |
252252
source ./scripts/ensure-node.sh
253253
# Minification takes some time. We only really need to do that for the binary (and we regenerate snapshots separately there)
254-
V8_SNAPSHOT_DISABLE_MINIFY=1 yarn build-v8-snapshot-prod
254+
V8_UPDATE_METAFILE=1 V8_SNAPSHOT_DISABLE_MINIFY=1 yarn build-v8-snapshot-prod
255255
- prepare-modules-cache # So we don't throw these in the workspace cache
256256
- persist_to_workspace:
257257
root: ~/

scripts/binary/binary-cleanup.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ const getDependencyPathsToKeep = async (buildAppDir) => {
5757
'node_modules/esutils/lib/utils.js',
5858
'node_modules/through/index.js',
5959
'node_modules/string-width/index.js',
60+
'node_modules/proxy-from-env/index.js',
6061
// end needed deps for geckodriver
6162
]
6263

0 commit comments

Comments
 (0)