Skip to content

Commit 63f0b5b

Browse files
alecthomasalecthomas
committed
fix: replace gotiny with a version that works
1 parent d7f2120 commit 63f0b5b

File tree

9 files changed

+101
-17
lines changed

9 files changed

+101
-17
lines changed

‎bin/.go-1.19.1.pkg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
hermit

‎bin/README.hermit.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Hermit environment
2+
3+
This is a [Hermit](https://github.com/cashapp/hermit) bin directory.
4+
5+
The symlinks in this directory are managed by Hermit and will automatically
6+
download and install Hermit itself as well as packages. These packages are
7+
local to this environment.

‎bin/activate-hermit

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
# This file must be used with "source bin/activate-hermit" from bash or zsh.
3+
# You cannot run it directly
4+
5+
if [ "${BASH_SOURCE-}" = "$0" ]; then
6+
echo "You must source this script: \$ source $0" >&2
7+
exit 33
8+
fi
9+
10+
BIN_DIR="$(dirname "${BASH_SOURCE[0]:-${(%):-%x}}")"
11+
if "${BIN_DIR}/hermit" noop > /dev/null; then
12+
eval "$("${BIN_DIR}/hermit" activate "${BIN_DIR}/..")"
13+
14+
if [ -n "${BASH-}" ] || [ -n "${ZSH_VERSION-}" ]; then
15+
hash -r 2>/dev/null
16+
fi
17+
18+
echo "Hermit environment $("${HERMIT_ENV}"/bin/hermit env HERMIT_ENV) activated"
19+
fi

‎bin/go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.go-1.19.1.pkg

‎bin/gofmt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.go-1.19.1.pkg

‎bin/hermit

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#!/bin/bash
2+
3+
set -eo pipefail
4+
5+
export HERMIT_USER_HOME=~
6+
7+
if [ -z "${HERMIT_STATE_DIR}" ]; then
8+
case "$(uname -s)" in
9+
Darwin)
10+
export HERMIT_STATE_DIR="${HERMIT_USER_HOME}/Library/Caches/hermit"
11+
;;
12+
Linux)
13+
export HERMIT_STATE_DIR="${XDG_CACHE_HOME:-${HERMIT_USER_HOME}/.cache}/hermit"
14+
;;
15+
esac
16+
fi
17+
18+
export HERMIT_DIST_URL="${HERMIT_DIST_URL:-https://github.com/cashapp/hermit/releases/download/stable}"
19+
HERMIT_CHANNEL="$(basename "${HERMIT_DIST_URL}")"
20+
export HERMIT_CHANNEL
21+
export HERMIT_EXE=${HERMIT_EXE:-${HERMIT_STATE_DIR}/pkg/hermit@${HERMIT_CHANNEL}/hermit}
22+
23+
if [ ! -x "${HERMIT_EXE}" ]; then
24+
echo "Bootstrapping ${HERMIT_EXE} from ${HERMIT_DIST_URL}" 1>&2
25+
INSTALL_SCRIPT="$(mktemp)"
26+
# This value must match that of the install script
27+
INSTALL_SCRIPT_SHA256="180e997dd837f839a3072a5e2f558619b6d12555cd5452d3ab19d87720704e38"
28+
if [ "${INSTALL_SCRIPT_SHA256}" = "BYPASS" ]; then
29+
curl -fsSL "${HERMIT_DIST_URL}/install.sh" -o "${INSTALL_SCRIPT}"
30+
else
31+
# Install script is versioned by its sha256sum value
32+
curl -fsSL "${HERMIT_DIST_URL}/install-${INSTALL_SCRIPT_SHA256}.sh" -o "${INSTALL_SCRIPT}"
33+
# Verify install script's sha256sum
34+
openssl dgst -sha256 "${INSTALL_SCRIPT}" | \
35+
awk -v EXPECTED="$INSTALL_SCRIPT_SHA256" \
36+
'$2!=EXPECTED {print "Install script sha256 " $2 " does not match " EXPECTED; exit 1}'
37+
fi
38+
/bin/bash "${INSTALL_SCRIPT}" 1>&2
39+
fi
40+
41+
exec "${HERMIT_EXE}" --level=fatal exec "$0" -- "$@"

‎bin/hermit.hcl

Whitespace-only changes.

‎go.mod

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,28 @@
11
module github.com/alecthomas/go_serialization_benchmarks
22

3-
go 1.13
3+
go 1.19
44

55
require (
66
github.com/200sc/bebop v0.0.8
7-
github.com/DataDog/zstd v1.4.5 // indirect
87
github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863
98
github.com/alecthomas/binary v0.0.0-20171101084825-6e8df1b1fb9d
109
github.com/calmh/xdr v1.1.0
1110
github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892
1211
github.com/glycerine/go-capnproto v0.0.0-20190118050403-2d07de3aa7fc
13-
github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 // indirect
14-
github.com/glycerine/rbtree v0.0.0-20190406191118-ceb71889d809 // indirect
1512
github.com/gogo/protobuf v1.3.2
1613
github.com/golang/protobuf v1.3.2
1714
github.com/google/flatbuffers v1.11.0
18-
github.com/gopherjs/gopherjs v0.0.0-20210603182125-eeedf4a0e899 // indirect
1915
github.com/hprose/hprose-go v0.0.0-20161031134501-83de97da5004
2016
github.com/hprose/hprose-golang v2.0.4+incompatible
2117
github.com/ikkerens/ikeapack v1.5.1
2218
github.com/itsmontoya/mum v0.3.2
2319
github.com/json-iterator/go v1.1.7
2420
github.com/linkedin/goavro v2.1.0+incompatible
2521
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e
26-
github.com/minio/sha256-simd v0.1.0 // indirect
2722
github.com/niubaoshu/gotiny v0.0.3
28-
github.com/philhofer/fwd v1.0.0 // indirect
29-
github.com/protolambda/zssz v0.1.1 // indirect
30-
github.com/prysmaticlabs/go-bitfield v0.0.0-20190825002834-fb724e897364 // indirect
3123
github.com/prysmaticlabs/go-ssz v0.0.0-20190827151743-72881c4223d8
3224
github.com/shamaton/msgpack/v2 v2.0.0
3325
github.com/shamaton/msgpackgen v0.1.1
34-
github.com/stretchrcom/testify v1.7.1 // indirect
3526
github.com/tinylib/msgp v1.1.0
3627
github.com/ugorji/go/codec v1.1.7
3728
github.com/valyala/fastjson v1.6.3
@@ -44,7 +35,33 @@ require (
4435
zombiezen.com/go/capnproto2 v2.17.0+incompatible
4536
)
4637

38+
require (
39+
github.com/DataDog/zstd v1.4.5 // indirect
40+
github.com/cybriq/gotiny v0.0.5 // indirect
41+
github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 // indirect
42+
github.com/glycerine/rbtree v0.0.0-20190406191118-ceb71889d809 // indirect
43+
github.com/go-stack/stack v1.8.0 // indirect
44+
github.com/golang/snappy v0.0.1 // indirect
45+
github.com/google/go-cmp v0.5.5 // indirect
46+
github.com/gopherjs/gopherjs v0.0.0-20210603182125-eeedf4a0e899 // indirect
47+
github.com/gorilla/websocket v1.4.2 // indirect
48+
github.com/jtolds/gls v4.20.0+incompatible // indirect
49+
github.com/minio/sha256-simd v0.1.0 // indirect
50+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
51+
github.com/modern-go/reflect2 v1.0.1 // indirect
52+
github.com/philhofer/fwd v1.0.0 // indirect
53+
github.com/pkg/errors v0.9.1 // indirect
54+
github.com/protolambda/zssz v0.1.1 // indirect
55+
github.com/prysmaticlabs/go-bitfield v0.0.0-20190825002834-fb724e897364 // indirect
56+
github.com/stretchrcom/testify v1.7.1 // indirect
57+
github.com/vmihailenco/tagparser v0.1.1 // indirect
58+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
59+
google.golang.org/appengine v1.6.5 // indirect
60+
gopkg.in/yaml.v2 v2.4.0 // indirect
61+
)
62+
4763
replace (
4864
github.com/itsmontoya/mum v0.5.6 => github.com/mojura/enkodo v0.5.6
65+
github.com/niubaoshu/gotiny v0.0.3 => github.com/cybriq/gotiny v0.0.6-0.20220412231127-0a1864225fc8
4966
github.com/stretchrcom/testify v1.7.1 => github.com/stretchr/testify v1.7.1
5067
)

‎go.sum

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
4242
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
4343
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
4444
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
45+
github.com/cybriq/gotiny v0.0.5 h1:VgEZDiDXaObPVhK9O+JNM6USguc+vUsz4dLMIMhuL7M=
46+
github.com/cybriq/gotiny v0.0.5/go.mod h1:u13//tC09EgkQTDqXZrf6bNI9cc9dr07ZqUVQreubzk=
47+
github.com/cybriq/gotiny v0.0.6-0.20220412231127-0a1864225fc8 h1:R/4a3XWWW1uXKNRbMXUTmnWpJAyMc+NUhT2+uf7oq3Q=
48+
github.com/cybriq/gotiny v0.0.6-0.20220412231127-0a1864225fc8/go.mod h1:u13//tC09EgkQTDqXZrf6bNI9cc9dr07ZqUVQreubzk=
4549
github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpTVGlwA=
4650
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4751
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -215,8 +219,6 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ
215219
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
216220
github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
217221
github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
218-
github.com/niubaoshu/gotiny v0.0.3 h1:aUt+fvr8nQmitT6XqwuBH8JUQz7QyS4A+KyCNXSesGc=
219-
github.com/niubaoshu/gotiny v0.0.3/go.mod h1:QdEauSzqdF5tbLIVtGYO6sqOhUKVPSZGd5x7xK5oeS4=
220222
github.com/niubaoshu/goutils v0.0.0-20180828035119-e8e576f66c2b h1:T7vmCmpGIvqlOOp5SXatALP+HYc/40ZHbxmgy+p+sN0=
221223
github.com/niubaoshu/goutils v0.0.0-20180828035119-e8e576f66c2b/go.mod h1:aDwH4aWrEBXw/uvtSvwNwxdtnsx++aP8c8ad4AmlRCg=
222224
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -292,7 +294,6 @@ github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhV
292294
github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU=
293295
github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
294296
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
295-
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
296297
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
297298
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
298299
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
@@ -306,7 +307,6 @@ github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT
306307
github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
307308
github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
308309
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
309-
github.com/ymz-ncnk/musgen v0.2.0 h1:6/XQxDUVUgS0faCdr5Ra/GeNFh5fd6WH7XEkvmoE+OQ=
310310
github.com/ymz-ncnk/musgen v0.2.0/go.mod h1:WVBDHghk3lkuPc+xPVnxH6nY8cU5aOiR1yAo1kbumks=
311311
github.com/ymz-ncnk/musgo v0.2.0 h1:6O4DCPYZZECF3uvDk44OmdDKV9xrBBv/6fmH9ay7wxI=
312312
github.com/ymz-ncnk/musgo v0.2.0/go.mod h1:WWU2nVvTp3Ohk9olhpMBxYGbrdL+ztkIc1Ya++pi+Bk=
@@ -362,7 +362,6 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG
362362
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
363363
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
364364
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
365-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
366365
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
367366
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
368367
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -459,12 +458,10 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
459458
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
460459
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
461460
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
462-
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
463461
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
464462
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
465463
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
466464
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
467-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
468465
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
469466
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
470467
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=

0 commit comments

Comments
 (0)