Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.11] electron-{bin,source,chromedriver}_35: init at 35.0.3 #392749

Merged
merged 8 commits into from
Mar 25, 2025

Conversation

nixpkgs-ci[bot]
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented Mar 24, 2025

Bot-based backport to release-24.11, triggered by a label in #387294.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

We already set it in chromium/common.nix, see 062eb42.

(cherry picked from commit eb66169)
electron/electron#44657
https://github.com/electron/electron/blob/e4bd0cd3dcc57cb6889f845c75952bf999cbf581/script/node/generate_node_headers.py#L34-L39

Co-authored-by: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Co-authored-by: Emily <git@emilylange.de>
(cherry picked from commit 112942f)
because electron 35+ needs gn in PATH at build time

[41984/43140] ACTION //third_party/electron_node:generate_config_gypi(//build/toolchain/linux/unbundle:default)
FAILED: gen/third_party/electron_node/config.gypi
python3 ../../third_party/electron_node/tools/generate_config_gypi.py gen/third_party/electron_node/config.gypi --out-dir . --dep-file gen/third_party/electron_node/generate_config_gypi.d --node-gn-path //third_party/electron_node
Traceback (most recent call last):
  File "/build/src/out/Release/../../third_party/electron_node/tools/generate_config_gypi.py", line 113, in <module>
    main()
  File "/build/src/out/Release/../../third_party/electron_node/tools/generate_config_gypi.py", line 100, in main
    config = get_gn_config(args.out_dir)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/build/src/out/Release/../../third_party/electron_node/tools/generate_config_gypi.py", line 32, in get_gn_config
    gn_args = subprocess.check_output(
              ^^^^^^^^^^^^^^^^^^^^^^^^
  File "/nix/store/26yi95240650jxp5dj78xzch70i1kzlz-python3-3.12.9/lib/python3.12/subprocess.py", line 468, in check_output
    return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/nix/store/26yi95240650jxp5dj78xzch70i1kzlz-python3-3.12.9/lib/python3.12/subprocess.py", line 550, in run
    with Popen(*popenargs, **kwargs) as process:
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/nix/store/26yi95240650jxp5dj78xzch70i1kzlz-python3-3.12.9/lib/python3.12/subprocess.py", line 1028, in __init__
    self._execute_child(args, executable, preexec_fn, close_fds,
  File "/nix/store/26yi95240650jxp5dj78xzch70i1kzlz-python3-3.12.9/lib/python3.12/subprocess.py", line 1963, in _execute_child
    raise child_exception_type(errno_num, err_msg, err_filename)
FileNotFoundError: [Errno 2] No such file or directory: 'gn'

(cherry picked from commit 2a66805)
FAILED: gen/third_party/electron_node/config.gypi
python3 ../../third_party/electron_node/tools/generate_config_gypi.py gen/third_party/electron_node/config.gypi --out-dir . --dep-file gen/third_party/electron_node/generate_config_gypi.d --node-gn-path //third_party/electron_node
Traceback (most recent call last):
  File "/build/src/out/Release/../../third_party/electron_node/tools/generate_config_gypi.py", line 113, in <module>
    main()
  File "/build/src/out/Release/../../third_party/electron_node/tools/generate_config_gypi.py", line 105, in main
    f.write(repr(translate_config(args.out_dir, config, v8_config)))
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/build/src/out/Release/../../third_party/electron_node/tools/generate_config_gypi.py", line 62, in translate_config
    'node_module_version': int(config['node_module_version']),
                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
ValueError: invalid literal for int() with base 10: '"133"'

Co-authored-by: Ljuzig <diamond.bertelli@gmail.com>
(cherry picked from commit 5213e7e)
As a precaution and to avoid problems with hydra builds that had to
be fixed in the past. References: ce04dc5 (#378988) and 3f514d3.

(cherry picked from commit 506d38b)
@teutat3s
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 392749


x86_64-linux

✅ 3 packages built:
  • electron-chromedriver_35
  • electron_35
  • electron_35-bin

Copy link
Contributor

@TomaSajt TomaSajt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, will merge tomorrow.

@teutat3s
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 392749


x86_64-linux

✅ 1 package built:
  • electron_34

@TomaSajt TomaSajt merged commit dc3423f into release-24.11 Mar 25, 2025
35 of 36 checks passed
@vbgl vbgl deleted the backport-387294-to-release-24.11 branch March 25, 2025 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants