diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 38f7dad..6a6e1b9 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -8,7 +8,7 @@ permissions: jobs: build: env: - TAMAGO_VERSION: 1.21.5 + TAMAGO_VERSION: 1.22.0 TAMAGO: /usr/local/tamago-go/bin/go APPLET_PRIVATE_KEY: /tmp/applet.sec APPLET_PUBLIC_KEY: /tmp/applet.pub diff --git a/Dockerfile b/Dockerfile index 0eb22cc..4384064 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-bookworm +FROM golang:1.22-bookworm ARG TAMAGO_VERSION ARG LOG_ORIGIN diff --git a/Makefile b/Makefile index 013e27d..b315dd5 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ SRK_HASH ?= PROTOC ?= /usr/bin/protoc TAMAGO_SEMVER = $(shell [ -n "${TAMAGO}" -a -x "${TAMAGO}" ] && ${TAMAGO} version | sed 's/.*go\([0-9]\.[0-9]*\.[0-9]*\).*/\1/') -MINIMUM_TAMAGO_VERSION=1.21.5 +MINIMUM_TAMAGO_VERSION=1.22.0 SHELL = /bin/bash diff --git a/go.mod b/go.mod index 6f33a4e..e55858d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/transparency-dev/armored-witness-os -go 1.21.5 +go 1.22.0 require ( github.com/cheggaaa/pb/v3 v3.1.5 @@ -21,7 +21,7 @@ require ( golang.org/x/crypto v0.20.0 golang.org/x/mod v0.15.0 google.golang.org/protobuf v1.32.0 - gvisor.dev/gvisor v0.0.0-20230614190805-57027c7d31f8 + gvisor.dev/gvisor v0.0.0-20240109032559-fc0349e3ac32 k8s.io/klog v1.0.0 ) @@ -29,7 +29,7 @@ require ( github.com/VividCortex/ewma v1.2.0 // indirect github.com/fatih/color v1.15.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect - github.com/google/btree v1.0.1 // indirect + github.com/google/btree v1.1.2 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect diff --git a/go.sum b/go.sum index e5a76c3..5e8fde8 100644 --- a/go.sum +++ b/go.sum @@ -17,8 +17,8 @@ github.com/flynn/u2f v0.0.0-20180613185708-15554eb68e5d/go.mod h1:shcCQPgKtaJz4o github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= +github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/gsora/fidati v0.0.0-20220824075547-eeb0a5f7d6c3 h1:klG3scbSLaGIvJO1p9wdTaHonsCSAcvNrX8vfa8LRd4= @@ -101,7 +101,7 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gvisor.dev/gvisor v0.0.0-20230614190805-57027c7d31f8 h1:cycLSWR8fzi6P+jQ9vaD82frUFZ0UU1kDZt1YPWFFhA= -gvisor.dev/gvisor v0.0.0-20230614190805-57027c7d31f8/go.mod h1:sQuqOkxbfJq/GS2uSnqHphtXclHyk/ZrAGhZBxxsq6g= +gvisor.dev/gvisor v0.0.0-20240109032559-fc0349e3ac32 h1:e818RLhTENrtMSISfJbh/70RG5cEqUd4dTl16FTUJM4= +gvisor.dev/gvisor v0.0.0-20240109032559-fc0349e3ac32/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= diff --git a/release/cloudbuild_ci.yaml b/release/cloudbuild_ci.yaml index a3f4b70..dd63b37 100644 --- a/release/cloudbuild_ci.yaml +++ b/release/cloudbuild_ci.yaml @@ -175,7 +175,7 @@ substitutions: # # Build-related. _FIRMWARE_BUCKET: 'armored-witness-firmware-ci-2' - _TAMAGO_VERSION: '1.21.5' + _TAMAGO_VERSION: '1.22.0' # Log-related. _ENTRIES_DIR: 'firmware-log-sequence' # This must correspond with the trailing number on the _FIRMWARE_BUCKET, _ORIGIN, _LOG_NAME values. diff --git a/release/cloudbuild_presubmit.yaml b/release/cloudbuild_presubmit.yaml index 3da2f2f..28687df 100644 --- a/release/cloudbuild_presubmit.yaml +++ b/release/cloudbuild_presubmit.yaml @@ -87,7 +87,7 @@ substitutions: # # Build-related. _FIRMWARE_BUCKET: 'armored-witness-firmware-ci-1' - _TAMAGO_VERSION: '1.21.5' + _TAMAGO_VERSION: '1.22.0' # This must correspond with the trailing number on the _FIRMWARE_BUCKET, _ORIGIN values. _KEY_VERSION: '1' _ORIGIN: 'transparency.dev/armored-witness/firmware_transparency/ci/1'