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-structurepull/26151/head
parent
f94c21025d
commit
51123f2da0
|
@ -287,7 +287,7 @@ jobs:
|
||||||
# Build a dev binary with the default cargo profile
|
# Build a dev binary with the default cargo profile
|
||||||
build-dev:
|
build-dev:
|
||||||
docker:
|
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:
|
auth:
|
||||||
username: _json_key
|
username: _json_key
|
||||||
password: $CISUPPORT_GCS_AUTHORIZATION
|
password: $CISUPPORT_GCS_AUTHORIZATION
|
||||||
|
@ -350,7 +350,7 @@ jobs:
|
||||||
# Compile cargo "release" profile binaries for influxdb3 edge releases
|
# Compile cargo "release" profile binaries for influxdb3 edge releases
|
||||||
build-release:
|
build-release:
|
||||||
docker:
|
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:
|
auth:
|
||||||
username: _json_key
|
username: _json_key
|
||||||
password: $CISUPPORT_GCS_AUTHORIZATION
|
password: $CISUPPORT_GCS_AUTHORIZATION
|
||||||
|
|
|
@ -21,3 +21,6 @@ valgrind-out.txt
|
||||||
*.pending-snap
|
*.pending-snap
|
||||||
# Helix editor configuration directory:
|
# Helix editor configuration directory:
|
||||||
**/.helix
|
**/.helix
|
||||||
|
# .cargo/config.toml is checked in, but glibc builds create .cargo/config to
|
||||||
|
# override it, which we can ignore
|
||||||
|
.cargo/config
|
||||||
|
|
Loading…
Reference in New Issue