From b4ddcd355f4d26c6cf4081774f1381b7b764a7cb Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Tue, 5 Sep 2023 22:07:47 +0200 Subject: [PATCH] chore: update to latest SDK --- build/go_build_help.go | 8 ++++---- go.mod | 15 +++------------ go.sum | 25 ++++++------------------- 3 files changed, 13 insertions(+), 35 deletions(-) diff --git a/build/go_build_help.go b/build/go_build_help.go index 610426e..70aa4fd 100644 --- a/build/go_build_help.go +++ b/build/go_build_help.go @@ -1,7 +1,7 @@ package build import ( - rpcv1 "code.icb4dc0.de/buildr/api/generated/rpc/v1" + commonv1 "code.icb4dc0.de/buildr/api/generated/common/v1" sdk "code.icb4dc0.de/buildr/wasi-module-sdk-go" ) @@ -71,7 +71,7 @@ Builds - as every other task - are executed in parallel.`, Although it is not very effective because the build process always has to download all dependencies if they are not cached.`, Spec: sdk.TaskSpec[sdk.Module]{ ModuleName: "buildr_linux_amd64", - Container: &rpcv1.ContainerSpec{ + Container: &commonv1.ContainerSpec{ Image: "golang:alpine", }, Module: GoBuild{ @@ -87,9 +87,9 @@ Although it is not very effective because the build process always has to downlo Description: `Specify additional environment variables.`, Spec: sdk.TaskSpec[sdk.Module]{ ModuleName: "buildr_linux_amd64", - Container: &rpcv1.ContainerSpec{ + Container: &commonv1.ContainerSpec{ Image: "golang:alpine", - VolumeMounts: []*rpcv1.ContainerVolumeMount{ + VolumeMounts: []*commonv1.ContainerVolumeMount{ { Target: "/go/pkg/mod", Name: "modcache", diff --git a/go.mod b/go.mod index 5f72b5b..b4e1bf0 100644 --- a/go.mod +++ b/go.mod @@ -3,20 +3,11 @@ module code.icb4dc0.de/buildr/golang-plugin go 1.21 require ( - code.icb4dc0.de/buildr/api v0.0.0-20230824061008-9729e3ce7ec3 - code.icb4dc0.de/buildr/wasi-module-sdk-go v0.0.0-20230824061052-8ded4bc17b7b + code.icb4dc0.de/buildr/api v0.0.0-20230905195458-e4d230e5c7fd + code.icb4dc0.de/buildr/wasi-module-sdk-go v0.0.0-20230905200642-04644e99d9a3 ) require ( - code.icb4dc0.de/buildr/common v0.0.0-20230823164419-5a757074eaa3 // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/tetratelabs/tinymem v0.1.0 // indirect - golang.org/x/net v0.14.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/grpc v1.57.0 // indirect + code.icb4dc0.de/buildr/common v0.0.0-20230905195627-a3d5bb4f1ee7 // indirect google.golang.org/protobuf v1.31.0 // indirect ) - -replace code.icb4dc0.de/buildr/wasi-module-sdk-go => ../wasi-module-sdk-go diff --git a/go.sum b/go.sum index ee279c2..dae65e2 100644 --- a/go.sum +++ b/go.sum @@ -1,27 +1,14 @@ -code.icb4dc0.de/buildr/api v0.0.0-20230824061008-9729e3ce7ec3 h1:CXt7gnJOMzk3lxXdYokRzwTeX6w7ZeceSBayvz8AfAw= -code.icb4dc0.de/buildr/api v0.0.0-20230824061008-9729e3ce7ec3/go.mod h1:eCeIvmMgYp/04nar7GnBDORMdO4jHYQl/RMiNJhyGf8= -code.icb4dc0.de/buildr/common v0.0.0-20230823164419-5a757074eaa3 h1:jWQCCE56vhfNoOuJj4JlCEcfXUB/40iR8L59j5xeh+s= -code.icb4dc0.de/buildr/common v0.0.0-20230823164419-5a757074eaa3/go.mod h1:u0PEZjq0l3ICCUgARZObM6Hc0ZlqkcjK0PBEozhAdNQ= +code.icb4dc0.de/buildr/api v0.0.0-20230905195458-e4d230e5c7fd h1:N4WkVoqphjFXfFwfKpLcEtS5lBCfd9NVytUutiszQ90= +code.icb4dc0.de/buildr/api v0.0.0-20230905195458-e4d230e5c7fd/go.mod h1:eWSjeX25XbbNGKlxVoOf2a8V6xOCIaQh5W65T7nNcL8= +code.icb4dc0.de/buildr/common v0.0.0-20230905195627-a3d5bb4f1ee7 h1:sqBO2IFI0Gs+FiM4kkQjj7QkC0p+AhJKqhCQqCEwlM4= +code.icb4dc0.de/buildr/common v0.0.0-20230905195627-a3d5bb4f1ee7/go.mod h1:biIRy/mBiVPAR/okWN5DFmB3Hnnxt2FP1Qswa4GBMeE= +code.icb4dc0.de/buildr/wasi-module-sdk-go v0.0.0-20230905200642-04644e99d9a3 h1:gzfbdfYGlhU6tyK/g07r6aS8AHQ555VEfrHhazGrYLg= +code.icb4dc0.de/buildr/wasi-module-sdk-go v0.0.0-20230905200642-04644e99d9a3/go.mod h1:S+fk+Nlmqj1u81xLnTWU5WLSMPKy4TmyWMiJ1XX9fRk= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/tetratelabs/tinymem v0.1.0 h1:Qza1JAg9lquPPJ/CIei5qQYx7t18KLie83O2WR6CM58= -github.com/tetratelabs/tinymem v0.1.0/go.mod h1:WFFTZFhLod6lTL+UetFAopVbGaB+KFsVcIY+RUv7NeY= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=