fix: don't use modified .cargo/config.toml (#26148)

We need to both add and remove keys from rustflags, but modifying
.cargo/config.toml in place causes the version string to have -dirty
appended to it. Use ci-support that instead creates ./.cargo/config (a
historic filename that is preferred over ./.cargo/config.toml if it
exists) and then git ignore ./.cargo/config.

References:
- https://github.com/influxdata/influxdb/issues/26147
- https://doc.rust-lang.org/cargo/reference/config.html?highlight=rustflags#hierarchical-structure
pull/26151/head
Jamie Strandboge 2025-03-16 14:19:59 -05:00 committed by GitHub
parent f94c21025d
commit 51123f2da0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions

View File

@ -287,7 +287,7 @@ jobs:
# Build a dev binary with the default cargo profile
build-dev:
docker:
- image: us-east1-docker.pkg.dev/influxdata-team-edge/ci-support/ci-cross-influxdb3@sha256:d0c9ed7385866ceeb9c143bda0e2ea607bed0000eb73577d02f9e52e1bddc2d6
- image: us-east1-docker.pkg.dev/influxdata-team-edge/ci-support/ci-cross-influxdb3@sha256:1f41029cb68a723c3b559a44bcf91e04b6a71b631b0886185562f4a90e1460ba
auth:
username: _json_key
password: $CISUPPORT_GCS_AUTHORIZATION
@ -350,7 +350,7 @@ jobs:
# Compile cargo "release" profile binaries for influxdb3 edge releases
build-release:
docker:
- image: us-east1-docker.pkg.dev/influxdata-team-edge/ci-support/ci-cross-influxdb3@sha256:d0c9ed7385866ceeb9c143bda0e2ea607bed0000eb73577d02f9e52e1bddc2d6
- image: us-east1-docker.pkg.dev/influxdata-team-edge/ci-support/ci-cross-influxdb3@sha256:1f41029cb68a723c3b559a44bcf91e04b6a71b631b0886185562f4a90e1460ba
auth:
username: _json_key
password: $CISUPPORT_GCS_AUTHORIZATION

3
.gitignore vendored
View File

@ -21,3 +21,6 @@ valgrind-out.txt
*.pending-snap
# Helix editor configuration directory:
**/.helix
# .cargo/config.toml is checked in, but glibc builds create .cargo/config to
# override it, which we can ignore
.cargo/config