Skip to content

Commit 18102bf

Browse files
authored
Merge branch 'main' into fix/uroot-tokeninternal-issue
2 parents 636383a + 1f42a6b commit 18102bf

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

.github/workflows/documentation-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
cd docs
9393
mdbook build
9494
- name: Upload artifact
95-
uses: actions/upload-pages-artifact@v3
95+
uses: actions/upload-pages-artifact@v4
9696
with:
9797
path: ./docs/public
9898

cmd/firmware-action/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/jedib0t/go-pretty/v6 v6.6.8
1717
github.com/plus3it/gorecurcopy v0.0.1
1818
github.com/sethvargo/go-githubactions v1.3.1
19-
github.com/stretchr/testify v1.10.0
19+
github.com/stretchr/testify v1.11.0
2020
)
2121

2222
require (

cmd/firmware-action/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ github.com/sosodev/duration v1.3.1/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERA
134134
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
135135
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
136136
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
137-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
138-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
137+
github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=
138+
github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
139139
github.com/vektah/gqlparser/v2 v2.5.28 h1:bIulcl3LF69ba6EiZVGD88y4MkM+Jxrf3P2MX8xLRkY=
140140
github.com/vektah/gqlparser/v2 v2.5.28/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo=
141141
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=

docker/compose.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,15 +325,23 @@ services:
325325
#==================
326326
# u-root
327327
#==================
328+
# Source: https://github.com/u-root/u-root
328329
uroot_0.14.0:
329330
build:
330331
context: uroot
331332
args:
332333
- GO_VERSION=1.24
333334
- UROOT_VERSION=0.14.0
335+
uroot_0.15.0:
336+
build:
337+
context: uroot
338+
args:
339+
- GO_VERSION=1.24
340+
- UROOT_VERSION=0.15.0
334341
#==================
335342
# u-boot
336343
#==================
344+
# Source: https://github.com/u-boot/u-boot
337345
uboot_2025.01:
338346
build:
339347
context: uboot
@@ -346,3 +354,9 @@ services:
346354
args:
347355
- UBOOT_VERSION=2025.04
348356
- SOURCE_IMAGE=ubuntu:noble
357+
uboot_2025.07:
358+
build:
359+
context: uboot
360+
args:
361+
- UBOOT_VERSION=2025.07
362+
- SOURCE_IMAGE=ubuntu:noble

0 commit comments

Comments
 (0)