Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update build/configs for TamaGo 1.23.1 #291

Merged
merged 3 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: ['1.22.4']
go: ['1.23.1']
include:
- language: go
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.22.x]
go-version: [1.23.x]
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.22
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
go-version-file: go.mod
- name: golangci-lint
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.55.0
version: v1.61.0
args: --timeout 5m
8 changes: 4 additions & 4 deletions cmd/provision/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ func waitAndProvision(ctx context.Context, fw *firmwares) error {
if *fuse && !*runAnyway {
return fmt.Errorf("witness serial number %s has HAB fuse set!", s.Serial)
}
klog.Infof("⚠️ Witness serial number %s is already HAB fused", s.Serial)
klog.Infof("⚠️ Witness serial number %s is already HAB fused", s.Serial)
} else {
klog.Infof("✅ Witness serial number %s is not HAB fused", s.Serial)
}
Expand All @@ -415,14 +415,14 @@ func waitAndProvision(ctx context.Context, fw *firmwares) error {
if *fuse {
return e
}
klog.Warningf("⚠️ " + e.Error())
klog.Warningf("⚠️ %s", e.Error())
}
if srkEnv != *habTarget {
e := fmt.Errorf("witness OS reports SRK Hash (%s) for unexpected release environment %q - we're set to %q, not fusing.", s.SRKHash, srkEnv, *habTarget)
if *fuse {
return e
}
klog.Warningf("⚠️ " + e.Error())
klog.Warningf("⚠️ %s", e.Error())
}

if *fuse {
Expand All @@ -437,7 +437,7 @@ func waitAndProvision(ctx context.Context, fw *firmwares) error {
if !*runAnyway {
return err
}
klog.Warningf("⚠️ %s, continuing anyway", err.Error())
klog.Warningf("⚠️ %s, continuing anyway", err.Error())
}
klog.Info("✅ Fusing successful! 👌")
// Close dev as we'll need to re-open it below after the device has rebooted...
Expand Down
2 changes: 1 addition & 1 deletion cmd/verify_build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# witness.
# The default entrypoint runs a continuous monitor that attempts
# to build all firmware artifacts committed to by a log.
FROM golang:1.22-alpine AS builder
FROM golang:1.23-alpine AS builder

ARG GOFLAGS=""
ENV GOFLAGS=$GOFLAGS
Expand Down
2 changes: 1 addition & 1 deletion deployment/build_and_release/live/ci/terragrunt.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ inputs = merge(
firmware_bucket_prefix = "armored-witness-firmware-ci"
origin_prefix = "transparency.dev/armored-witness/firmware_transparency/ci"

tamago_version = "1.22.4"
tamago_version = "1.23.1"
log_public_key = "transparency.dev-aw-ftlog-ci-4+30fe79e3+AUDoas+smwQDTlYbTzbEcAW+N6WyvB/4CysMWjpnRgat"
applet_public_key = "transparency.dev-aw-applet-ci+3ff32e2c+AV1fgxtByjXuPjPfi0/7qTbEBlPGGCyxqr6ZlppoLOz3"
os_public_key1 = "transparency.dev-aw-os1-ci+7a0eaef3+AcsqvmrcKIbs21H2Bm2fWb6oFWn/9MmLGNc6NLJty2eQ"
Expand Down
2 changes: 1 addition & 1 deletion deployment/build_and_release/live/presubmit/terragrunt.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ inputs = merge(
log_shard = 2
origin_prefix = "transparency.dev/armored-witness/firmware_transparency/ci"

tamago_version = "1.22.4"
tamago_version = "1.23.1"
log_public_key = "transparency.dev-aw-ftlog-ci-2+f77c6276+AZXqiaARpwF4MoNOxx46kuiIRjrML0PDTm+c7BLaAMt6"
applet_public_key = "transparency.dev-aw-applet-ci+3ff32e2c+AV1fgxtByjXuPjPfi0/7qTbEBlPGGCyxqr6ZlppoLOz3"
os_public_key1 = "transparency.dev-aw-os1-ci+7a0eaef3+AcsqvmrcKIbs21H2Bm2fWb6oFWn/9MmLGNc6NLJty2eQ"
Expand Down
2 changes: 1 addition & 1 deletion deployment/build_and_release/live/prod/terragrunt.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ inputs = merge(
firmware_bucket_prefix = "armored-witness-firmware-prod"
origin_prefix = "transparency.dev/armored-witness/firmware_transparency/prod"

tamago_version = "1.22.4"
tamago_version = "1.23.1"
log_public_key = "transparency.dev-aw-ftlog-prod-1+3e6d87ee+Aa3qdhefd2cc/98jV3blslJT2L+iFR8WKHeGcgFmyjnt"
applet_public_key = "transparency.dev-aw-applet-prod+d45f2a0d+AZSnFa8GxH+jHV6ahELk6peqVObbPKrYAdYyMjrzNF35"
os_public_key1 = "transparency.dev-aw-os1-prod+985bdfd2+AV7mmRamQp6VC9CutzSXzqtNhYNyNmQQRcLX07F6qlC1"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/transparency-dev/armored-witness

go 1.22.4
go 1.23.1

require (
cloud.google.com/go/kms v1.20.0
Expand Down
Loading