Skip to content

Commit 3324721

Browse files
committed
fix: fix compilation on alpine linux
sha256sum in busybox doesn't support --check. go-sqlite3 fails to build: mattn/go-sqlite3#1164
1 parent 9c8f296 commit 3324721

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ require (
2929
github.com/google/btree v1.0.1
3030
github.com/google/go-cmp v0.6.0
3131
github.com/google/go-jsonnet v0.17.0
32+
github.com/google/uuid v1.6.0
3233
github.com/hashicorp/vault/api v1.0.2
3334
github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe
3435
github.com/influxdata/flux v0.195.1
@@ -42,7 +43,7 @@ require (
4243
github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef
4344
github.com/kevinburke/go-bindata v3.22.0+incompatible
4445
github.com/mattn/go-isatty v0.0.19
45-
github.com/mattn/go-sqlite3 v1.14.18
46+
github.com/mattn/go-sqlite3 v1.14.22
4647
github.com/matttproud/golang_protobuf_extensions v1.0.4
4748
github.com/mileusna/useragent v0.0.0-20190129205925-3e331f0949a5
4849
github.com/mna/pigeon v1.0.1-0.20180808201053-bb0192cfc2ae
@@ -161,7 +162,6 @@ require (
161162
github.com/golang/protobuf v1.5.4 // indirect
162163
github.com/google/flatbuffers v24.3.25+incompatible // indirect
163164
github.com/google/s2a-go v0.1.7 // indirect
164-
github.com/google/uuid v1.6.0 // indirect
165165
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
166166
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
167167
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -702,8 +702,8 @@ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
702702
github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
703703
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
704704
github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
705-
github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI=
706-
github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
705+
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
706+
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
707707
github.com/mattn/go-tty v0.0.4 h1:NVikla9X8MN0SQAqCYzpGyXv0jY7MNl3HOWD2dkle7E=
708708
github.com/mattn/go-tty v0.0.4/go.mod h1:u5GGXBtZU6RQoKV8gY5W6UhMudbR5vXnUe7j3pxse28=
709709
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=

scripts/ci/test-downgrade.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function download_older_binary () {
2929

3030
local -r archive="influxd-${target_version}.tar.gz"
3131
curl -sL -o "${dl_dir}/${archive}" "$dl_url"
32-
echo "${dl_sha} ${dl_dir}/${archive}" | sha256sum --check --
32+
echo "${dl_sha} ${dl_dir}/${archive}" | sha256sum -c --
3333
tar xzf "${dl_dir}/${archive}" -C "$dl_dir" --strip-components=1
3434
rm "${dl_dir}/${archive}"
3535
mv "${dl_dir}/influxd" "${dl_dir}/influxd-${target_version}"

scripts/fetch-ui-assets.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ curl -L https://github.com/influxdata/ui/releases/download/$UI_RELEASE/build.tar
3131
# Verify the checksums match; exit if they don't.
3232
case "$(uname -s)" in
3333
FreeBSD | Darwin)
34-
echo "$(cat sha256.txt)" | shasum --algorithm 256 --check \
34+
echo "$(cat sha256.txt)" | shasum --algorithm 256 -c \
3535
|| { echo "Checksums did not match for downloaded UI assets!"; exit 1; } ;;
3636
Linux)
37-
echo "$(cat sha256.txt)" | sha256sum --check -- \
37+
echo "$(cat sha256.txt)" | sha256sum -c -- \
3838
|| { echo "Checksums did not match for downloaded UI assets!"; exit 1; } ;;
3939
*)
4040
echo "The '$(uname -s)' operating system is not supported as a build host for the UI" >&2

0 commit comments

Comments
 (0)