Skip to content

fix(build): Fetch with cli while updating the registry index #1570

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

Merged
merged 1 commit into from
Nov 9, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ ENV RELAY_FEATURES=${RELAY_FEATURES}
COPY . .

# Build with the modern compiler toolchain enabled
RUN scl enable devtoolset-10 llvm-toolset-7.0 -- \
RUN echo -e "[net]\ngit-fetch-with-cli = true" > $CARGO_HOME/config \
&& scl enable devtoolset-10 llvm-toolset-7.0 -- \
Copy link
Member

Choose a reason for hiding this comment

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

This can also be set on the command line, but I'm not sure if we want to change the Makefile for this. Maybe we can just insert a RUN cargo --config net.git-fetch-with-cli=true fetch before this command?

Copy link
Member

Choose a reason for hiding this comment

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

For reference, in symbolic it's been done like this: getsentry/symbolic#585
Ideally we fix this for the binary and library builds alike.

Copy link
Contributor

Choose a reason for hiding this comment

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

Excuse me, what does this command means (effect) in this case ? RUN cargo --config net.git-fetch-with-cli=true fetch @jjbayer

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jan-auer yeah, so that's what this PR does as well, just adds the config for cargo with same option.

make build-linux-release \
TARGET=${BUILD_TARGET} \
RELAY_FEATURES=${RELAY_FEATURES}
Expand Down