Skip to content

Commit 0e80bb5

Browse files
committed
chore: bump go-fdo
Signed-off-by: Antonio Murdaca <[email protected]>
1 parent d7f18d8 commit 0e80bb5

File tree

7 files changed

+43
-13
lines changed

7 files changed

+43
-13
lines changed

.github/scripts/fdo-utils.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ set_rendezvous_info () {
113113
curl --fail --verbose --silent \
114114
--header 'Content-Type: text/plain' \
115115
--request POST \
116-
--data-raw "[[[5,\"${rendezvous_dns}\"],[3,${rendezvous_port}],[12,1],[2,\"${rendezvous_ip}\"],[4,${rendezvous_port}]]]" \
116+
--data-raw "[{\"dns\":\"${rendezvous_dns}\",\"device_port\":\"${rendezvous_port}\",\"owner_port\":\"${rendezvous_port}\",\"protocol\":\"http\",\"ip\":\"${rendezvous_ip}\"}]" \
117117
"http://${manufacturer_service}/api/v1/rvinfo"
118118
}
119119

@@ -142,7 +142,7 @@ set_owner_redirect_info () {
142142
local port=$3
143143
curl --fail --verbose --silent "http://${service}/api/v1/owner/redirect" \
144144
--header 'Content-Type: text/plain' \
145-
--data-raw "[[\"${ip}\",\"${ip}\",${port},3]]"
145+
--data-raw "[{\"dns\":\"${ip}\",\"port\":\"${port}\",\"protocol\":\"http\",\"ip\":\"${ip}\"}]"
146146
}
147147

148148
send_ov_to_owner () {

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Install golang
1919
uses: actions/setup-go@v5
2020
with:
21-
go-version: "1.23"
21+
go-version: "1.25"
2222

2323
- name: Check out repository code
2424
uses: actions/checkout@v4

.packit.yaml

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ srpm_build_deps:
1616
- make
1717
- git
1818
- golang
19+
- bison
1920
- go-vendor-tools
2021
- gzip
2122
- tar
@@ -33,6 +34,19 @@ packages:
3334
pkg_tool: centpkg
3435

3536
actions:
37+
post-upstream-clone:
38+
- |
39+
bash -c "
40+
#! /bin/bash
41+
set -x
42+
go_version=$(go version | cut -f 3 -d ' ')
43+
if [ "${go_version}" != "go1.25.0" ]; then
44+
command -v gvm &>/dev/null || { curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/refs/tags/1.0.22/binscripts/gvm-installer -o /tmp/gvm-installer && bash /tmp/gvm-installer; }
45+
source ${HOME}/.gvm/scripts/gvm
46+
gvm install go1.25.0
47+
gvm use go1.25.0 --default
48+
fi
49+
"
3650
pre-sync:
3751
- make vendor-tarball VERSION=${PACKIT_PROJECT_VERSION}
3852
create-archive:
@@ -44,8 +58,16 @@ jobs:
4458
packages: [go-fdo-client-fedora]
4559
trigger: pull_request
4660
targets:
47-
- fedora-stable
48-
- fedora-development
61+
fedora-branched:
62+
additional_repos:
63+
- https://download.copr.fedorainfracloud.org/results/@go-sig/golang-rawhide/fedora-$releasever-$basearch/
64+
additional_packages:
65+
- golang
66+
fedora-rawhide:
67+
additional_repos:
68+
- https://download.copr.fedorainfracloud.org/results/@go-sig/golang-rawhide/fedora-rawhide-$basearch/
69+
additional_packages:
70+
- golang
4971

5072
- <<: *copr_fedora
5173
trigger: commit
@@ -65,8 +87,16 @@ jobs:
6587
packages: [go-fdo-client-centos]
6688
trigger: pull_request
6789
targets:
68-
- epel-9
69-
- epel-10
90+
epel-9:
91+
additional_repos:
92+
- https://download.copr.fedorainfracloud.org/results/@go-sig/golang-rawhide/epel-9-$basearch/
93+
additional_packages:
94+
- golang
95+
epel-10:
96+
additional_repos:
97+
- https://download.copr.fedorainfracloud.org/results/@go-sig/golang-rawhide/epel-10-$basearch/
98+
additional_packages:
99+
- golang
70100

71101
- <<: *copr_centos
72102
trigger: commit

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: Apache 2.0
22

3-
FROM golang:1.23-alpine AS builder
3+
FROM golang:1.25-alpine AS builder
44

55
WORKDIR /go/src/app
66
COPY . .

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
## Prerequisites
1010

11-
- Go 1.23.0 or later
11+
- Go 1.25.0 or later
1212
- A Go module initialized with `go mod init`
1313

1414
## Building the Client Application

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/fido-device-onboard/go-fdo-client
22

3-
go 1.23.0
3+
go 1.25.0
44

55
require (
6-
github.com/fido-device-onboard/go-fdo v0.0.0-20250601145551-2778c77d4779
6+
github.com/fido-device-onboard/go-fdo v0.0.0-20250926190721-66d121649552
77
github.com/fido-device-onboard/go-fdo/fsim v0.0.0-20250601145551-2778c77d4779
88
github.com/fido-device-onboard/go-fdo/tpm v0.0.0-20250601145551-2778c77d4779
99
github.com/google/go-tpm v0.9.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
55
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
66
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
77
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
8-
github.com/fido-device-onboard/go-fdo v0.0.0-20250601145551-2778c77d4779 h1:vShuopgPCWaDt8j85NEgus/8tswfZp7CR5xwptjqsj8=
9-
github.com/fido-device-onboard/go-fdo v0.0.0-20250601145551-2778c77d4779/go.mod h1:8W0CU5ojm+7rFWW93EMxsyXSz4aDtMNiDT2tPIPPatc=
8+
github.com/fido-device-onboard/go-fdo v0.0.0-20250926190721-66d121649552 h1:Ysbb51WQDIKfPfuY7WJj/nEkpsD3f+lAMQgA0q/TlKU=
9+
github.com/fido-device-onboard/go-fdo v0.0.0-20250926190721-66d121649552/go.mod h1:01JaWYOQtO5PP2MjiddBMzfAXmx9WPILx+IHwWXszAA=
1010
github.com/fido-device-onboard/go-fdo/fsim v0.0.0-20250601145551-2778c77d4779 h1:sqXF4LMVf0DexhclOAVvlU8QNXkhm30Ur7Z2NGIsh6Y=
1111
github.com/fido-device-onboard/go-fdo/fsim v0.0.0-20250601145551-2778c77d4779/go.mod h1:OlL5PQ2GtOUf05qzWFj9cCCCS9rR2hFAvYGvseabOTI=
1212
github.com/fido-device-onboard/go-fdo/tpm v0.0.0-20250601145551-2778c77d4779 h1:CQXfxLZ+wglkcOT80zAutdz396CWoXZ4Arxnuv3eHAI=

0 commit comments

Comments
 (0)