Skip to content

fix: use new cache, add rustlib path (1.11) #27235

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.

Sign up for GitHub

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
bnpfeife merged 1 commit into from
Feb 19, 2026
+17 −5
Merged

fix: use new cache, add rustlib path (1.11) #27235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
keys:
# We save the cache from this one, so don't restore a cache with old junk and then save new stuff alongside.
# Start either with the exact right cache, or completely fresh.
- influxdb-cache-v1-{{ checksum "go.mod" }}
- influxdb-cache-v2-{{ checksum "go.mod" }}
- run:
name: Get InfluxDB Version
# TODO: Remove this!
Expand Down Expand Up @@ -88,13 +88,25 @@ jobs:
;;
esac

# rustlib
if [[ "${GOOS}" == linux ]] ; then
case "${GOARCH}" in
amd64)
rustlib="$(find_rustlib_path x86_64-unknown-linux-musl)"
;;
arm64)
rustlib="$(find_rustlib_path aarch64-unknown-linux-musl)"
;;
esac
fi

# linker flags
case "${GOOS}" in
darwin|windows)
ldflags='-s -w'
;;
linux)
ldflags='-s -w -linkmode=external -extld='"${CC}"' -extldflags "-fno-PIC -static-pie -Wl,-z,stack-size=8388608"'
ldflags='-s -w -linkmode=external -extld='"${CC}"' -extldflags "-fno-PIC -static-pie -Wl,-z,stack-size=8388608 -L'"${rustlib}"' -Wl,-lunwind"'
;;
esac

Expand Down Expand Up @@ -173,7 +185,7 @@ jobs:
paths:
- artifacts
- save_cache:
key: influxdb-cache-v1-{{ checksum "go.mod" }}
key: influxdb-cache-v2-{{ checksum "go.mod" }}
paths:
- /go/pkg/mod
- /root/.cargo
Expand Down Expand Up @@ -296,8 +308,8 @@ jobs:
- checkout
- restore_cache:
keys:
- influxdb-cache-v1-{{ checksum "go.mod" }}
- influxdb-cache-v1
- influxdb-cache-v2-{{ checksum "go.mod" }}
- influxdb-cache-v2
- when:
condition: << parameters.race >>
steps:
Expand Down