From 105980bb73f128475714fe1b7ee6bef7b57ba972 Mon Sep 17 00:00:00 2001 From: criyle Date: Sun, 20 Mar 2022 23:40:21 -0700 Subject: [PATCH] *: bump to go1.18 --- .github/workflows/build.yml | 4 ++-- .../grpc_executor/grpc_other.go | 1 - cmd/executorserver/grpc_executor/grpc_unix.go | 1 - cmd/executorserver/model/util_others.go | 1 - cmd/executorserver/version/genversion.go | 1 - cmd/executorshell/shell_other.go | 1 - env/env_others.go | 1 - env/noseccomp_linux.go | 1 - env/seccomp_linux.go | 1 - envexec/file_util_others.go | 1 - go.mod | 10 +++++----- go.sum | 20 ++++++++----------- 12 files changed, 15 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a489318..a1e1023 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,11 +44,11 @@ jobs: - os: macos-latest GOARCH: "arm64" steps: - - name: Set up Go 1.17 + - name: Set up Go 1.18 if: ${{ matrix.os != 'macos-latest' }} uses: actions/setup-go@v2 with: - go-version: 1.17 + go-version: 1.18 - name: Set up Go 1.16 if: ${{ matrix.os == 'macos-latest' }} uses: actions/setup-go@v2 diff --git a/cmd/executorserver/grpc_executor/grpc_other.go b/cmd/executorserver/grpc_executor/grpc_other.go index 7855d86..8984c66 100644 --- a/cmd/executorserver/grpc_executor/grpc_other.go +++ b/cmd/executorserver/grpc_executor/grpc_other.go @@ -1,5 +1,4 @@ //go:build !linux && !darwin -// +build !linux,!darwin package grpcexecutor diff --git a/cmd/executorserver/grpc_executor/grpc_unix.go b/cmd/executorserver/grpc_executor/grpc_unix.go index c383d8a..0dd2ac6 100644 --- a/cmd/executorserver/grpc_executor/grpc_unix.go +++ b/cmd/executorserver/grpc_executor/grpc_unix.go @@ -1,5 +1,4 @@ //go:build linux || darwin -// +build linux darwin package grpcexecutor diff --git a/cmd/executorserver/model/util_others.go b/cmd/executorserver/model/util_others.go index 87a0880..5a17264 100644 --- a/cmd/executorserver/model/util_others.go +++ b/cmd/executorserver/model/util_others.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package model diff --git a/cmd/executorserver/version/genversion.go b/cmd/executorserver/version/genversion.go index 2c182ef..fe053d2 100644 --- a/cmd/executorserver/version/genversion.go +++ b/cmd/executorserver/version/genversion.go @@ -1,5 +1,4 @@ //go:build ignore -// +build ignore package main diff --git a/cmd/executorshell/shell_other.go b/cmd/executorshell/shell_other.go index 2ab0d6c..728d58d 100644 --- a/cmd/executorshell/shell_other.go +++ b/cmd/executorshell/shell_other.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package main diff --git a/env/env_others.go b/env/env_others.go index 44e70ac..b04aef3 100644 --- a/env/env_others.go +++ b/env/env_others.go @@ -1,5 +1,4 @@ //go:build !windows && !linux && !darwin -// +build !windows,!linux,!darwin package env diff --git a/env/noseccomp_linux.go b/env/noseccomp_linux.go index 5aa49e9..bf38534 100644 --- a/env/noseccomp_linux.go +++ b/env/noseccomp_linux.go @@ -1,5 +1,4 @@ //go:build !seccomp -// +build !seccomp package env diff --git a/env/seccomp_linux.go b/env/seccomp_linux.go index cfb629c..a15eb3b 100644 --- a/env/seccomp_linux.go +++ b/env/seccomp_linux.go @@ -1,5 +1,4 @@ //go:build seccomp -// +build seccomp package env diff --git a/envexec/file_util_others.go b/envexec/file_util_others.go index cc566ff..4975210 100644 --- a/envexec/file_util_others.go +++ b/envexec/file_util_others.go @@ -1,5 +1,4 @@ //go:build !linux -// +build !linux package envexec diff --git a/go.mod b/go.mod index adcb2bf..cc56e50 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ module github.com/criyle/go-judge -go 1.17 +go 1.18 require ( github.com/creack/pty v1.1.17 - github.com/criyle/go-sandbox v0.9.3 + github.com/criyle/go-sandbox v0.9.4 github.com/elastic/go-seccomp-bpf v1.2.0 github.com/elastic/go-ucfg v0.8.4 github.com/gin-contrib/zap v0.0.2 @@ -17,10 +17,10 @@ require ( github.com/prometheus/client_golang v1.12.1 github.com/zsais/go-gin-prometheus v0.1.0 go.uber.org/zap v1.21.0 - golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000 + golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd golang.org/x/net v0.0.0-20220225172249-27dd8689420f golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 + golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 google.golang.org/grpc v1.45.0 google.golang.org/protobuf v1.27.1 gopkg.in/yaml.v2 v2.4.0 @@ -52,7 +52,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect - google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 // indirect + google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e // indirect ) retract ( diff --git a/go.sum b/go.sum index ecc80fb..c57feae 100644 --- a/go.sum +++ b/go.sum @@ -65,8 +65,8 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI= github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= -github.com/criyle/go-sandbox v0.9.3 h1:vOp8mkzvNwUF/VMlCxy7Q06WXnlo5RYjNxsyrkzX2cQ= -github.com/criyle/go-sandbox v0.9.3/go.mod h1:wPFlKID7xjiEACRlh/DApG3h89y27KR66Qqu5MmsBeo= +github.com/criyle/go-sandbox v0.9.4 h1:y8tzh6SLcQRu++FSJa1oiTiRgPoUXz5bDR/03udMQ8o= +github.com/criyle/go-sandbox v0.9.4/go.mod h1:97GO3nykaFkABZyFvRAbaQRFh+D6/BhzK+L/VHa2kNc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -274,7 +274,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= @@ -314,8 +313,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000 h1:SL+8VVnkqyshUSz5iNnXtrBQzvFF2SkROm6t5RczFAE= -golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38= +golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -444,11 +443,9 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng= -golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -566,8 +563,8 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 h1:FglFEfyj61zP3c6LgjmVHxYxZWXYul9oiS1EZqD5gLc= -google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e h1:fNKDNuUyC4WH+inqDMpfXDdfvwfYILbsX+oskGZ8hxg= +google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -582,7 +579,6 @@ google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=