Skip to content
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

fix: fix compilation on alpine linux #25180

Open
wants to merge 1 commit into
base: 2.7
Choose a base branch
from
Open

fix: fix compilation on alpine linux #25180

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ require (
github.com/google/btree v1.0.1
github.com/google/go-cmp v0.6.0
github.com/google/go-jsonnet v0.17.0
github.com/google/uuid v1.6.0
github.com/hashicorp/vault/api v1.0.2
github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe
github.com/influxdata/flux v0.195.1
Expand All @@ -42,7 +43,7 @@ require (
github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef
github.com/kevinburke/go-bindata v3.22.0+incompatible
github.com/mattn/go-isatty v0.0.19
github.com/mattn/go-sqlite3 v1.14.18
github.com/mattn/go-sqlite3 v1.14.22
github.com/matttproud/golang_protobuf_extensions v1.0.4
github.com/mileusna/useragent v0.0.0-20190129205925-3e331f0949a5
github.com/mna/pigeon v1.0.1-0.20180808201053-bb0192cfc2ae
Expand Down Expand Up @@ -161,7 +162,6 @@ require (
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/flatbuffers v24.3.25+incompatible // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,8 +702,8 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI=
github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
github.com/mattn/go-tty v0.0.4 h1:NVikla9X8MN0SQAqCYzpGyXv0jY7MNl3HOWD2dkle7E=
github.com/mattn/go-tty v0.0.4/go.mod h1:u5GGXBtZU6RQoKV8gY5W6UhMudbR5vXnUe7j3pxse28=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/test-downgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function download_older_binary () {

local -r archive="influxd-${target_version}.tar.gz"
curl -sL -o "${dl_dir}/${archive}" "$dl_url"
echo "${dl_sha} ${dl_dir}/${archive}" | sha256sum --check --
echo "${dl_sha} ${dl_dir}/${archive}" | sha256sum -c --
tar xzf "${dl_dir}/${archive}" -C "$dl_dir" --strip-components=1
rm "${dl_dir}/${archive}"
mv "${dl_dir}/influxd" "${dl_dir}/influxd-${target_version}"
Expand Down
4 changes: 2 additions & 2 deletions scripts/fetch-ui-assets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ curl -L https://github.com/influxdata/ui/releases/download/$UI_RELEASE/build.tar
# Verify the checksums match; exit if they don't.
case "$(uname -s)" in
FreeBSD | Darwin)
echo "$(cat sha256.txt)" | shasum --algorithm 256 --check \
echo "$(cat sha256.txt)" | shasum --algorithm 256 -c \
|| { echo "Checksums did not match for downloaded UI assets!"; exit 1; } ;;
Linux)
echo "$(cat sha256.txt)" | sha256sum --check -- \
echo "$(cat sha256.txt)" | sha256sum -c -- \
|| { echo "Checksums did not match for downloaded UI assets!"; exit 1; } ;;
*)
echo "The '$(uname -s)' operating system is not supported as a build host for the UI" >&2
Expand Down