1708650 - mach build modifies Cargo.lock

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Timothy Nikkel (:tnikkel)]

When I run ./mach build now it modifies my Cargo.lock

diff --git a/Cargo.lock b/Cargo.lock
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1789,7 +1789,6 @@ dependencies = [
"log",
"marionette",
"mozdevice",

• "mozilla-central-workspace-hack",
  "mozprofile",
  "mozrunner",
  "mozversion",

Assuming from bug 1705376

Comment 1

[BugBot [:suhaib / :marco/ :calixte]]

Set release status flags based on info from the regressing bug 1705376

Comment 2

[Mitchell Hentges [:mhentges] 🦀]

Hmm, I could see this happening if the patch didn't include this change requested by glandium.
I did a /mach build on both Windows and Linux and I'm unable to reproduce this problem.

• Is mozilla-central-workspace-hack in testing/geckodriver/Cargo.toml for you?
• Can you reproduce the issue on clean central?
• If so, what does your mozconfig look like?

Comment 3

[Mike Hommey [:glandium]]

It's because mozilla-central-workspace-hack is not in testing/geckodriver/Cargo.toml that there is a problem. Cargo.lock was not updated to reflect that.

Comment 4

[Timothy Nikkel (:tnikkel)]

Not sure if you need this information now but here it is.

mozconfig
#ac_add_options --with-macos-sdk=$HOME/.mozbuild/macOS-SDK-archive/MacOSX10.14.sdk

ac_add_options --enable-optimize
#ac_add_options --disable-debug
ac_add_options --enable-debug

#ac_add_options RUSTC_OPT_LEVEL=2

ac_add_options --enable-dump-painting

What do you mean clean central? I had no patches applied, no changesets in progress, and made no changes to any files, I rm -fr'd my obj dir.

There is no mozilla-central-workspace-hack in testing/geckodriver/Cargo.toml

I'm on macos if that matters.

I tested it more than once (rm -fr objdir, revert all, build again).

Backing out bug 1705376 locally fixed the issue.

Tried today in a different source tree and it didn't seem to have this problem.

Comment 5

[Mitchell Hentges [:mhentges] 🦀]

Oh, I see, the way Bugzilla rendered your original message caused me to assume that the workspace-hack was added, which threw me off.

Comment 6

[Timothy Nikkel (:tnikkel)]

(In reply to Mitchell Hentges [:mhentges] 🦀 from comment #5)

Oh, I see, the way Bugzilla rendered your original message caused me to assume that the workspace-hack was added, which threw me off.

It was removed, sorry about the rendering.

Comment 7

[Mitchell Hentges [:mhentges] 🦀]

This was resolved in this patch by accident.