Skip to content

Commit d886539

Browse files
paralinparalin
committed
fix: version conflict for docker and goreleaser
Signed-off-by: Christian Stewart <[email protected]>
1 parent 0c0a8a5 commit d886539

File tree

6 files changed

+85
-19
lines changed

6 files changed

+85
-19
lines changed

‎.github/workflows/tests.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,14 @@ jobs:
6565
- name: Depcheck Js
6666
run: yarn run deps
6767

68-
- name: Install chrome
69-
uses: browser-actions/setup-chrome@latest
68+
- name: Check goreleaser
69+
run: make release-check
7070

71+
# Issue: https://github.com/agnivade/wasmbrowsertest/pull/72/files
7172
# Issue: https://github.com/agnivade/wasmbrowsertest/issues/60
72-
# Remove the || true once fixed.
73-
- name: Test with chrome
74-
run: make test-browser || true
73+
# Remove the comment once fixed.
74+
#
75+
# - name: Install chrome
76+
# uses: browser-actions/setup-chrome@latest
77+
# - name: Test with chrome
78+
# run: make test-browser || true

‎.goreleaser.yaml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
2+
# vim: set ts=2 sw=2 tw=0 fo=cnqoj
3+
4+
version: 2
5+
6+
before:
7+
hooks:
8+
- go mod tidy
9+
10+
builds: []
11+
#- id: "common"
12+
# main: ./cmd/common
13+
# binary: common
14+
# env:
15+
# - CGO_ENABLED=0
16+
# flags:
17+
# - -trimpath
18+
# ldflags:
19+
# - -s -w -X main.version={{.Version}}
20+
# goos:
21+
# - linux
22+
# - windows
23+
# - darwin
24+
# goarch:
25+
# - amd64
26+
# - arm64
27+
28+
archives:
29+
- formats: ["tar.gz"]
30+
# this name template makes the OS and Arch compatible with the results of `uname`.
31+
name_template: >-
32+
{{ .ProjectName }}_
33+
{{- title .Os }}_
34+
{{- if eq .Arch "amd64" }}x86_64
35+
{{- else }}{{ .Arch }}{{ end }}
36+
{{- if .Arm }}v{{ .Arm }}{{ end }}
37+
# use zip for windows archives
38+
format_overrides:
39+
- goos: windows
40+
formats: ['zip']
41+
42+
changelog:
43+
sort: asc
44+
filters:
45+
exclude:
46+
- "^docs:"
47+
- "^test:"
48+
- "^chore:"
49+
- "^.github:"
50+
- "^hack:"

‎go.mod.tools

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ toolchain go1.24.2
66

77

88
replace (
9-
github.com/docker/docker => github.com/docker/docker v28.0.1+incompatible
9+
github.com/docker/docker => github.com/docker/docker v28.1.1+incompatible // latest
10+
github.com/google/go-containerregistry => github.com/paralin/go-containerregistry v0.20.4-0.20250428225319-e56496e419b1 // update-docker
1011
google.golang.org/protobuf => github.com/aperturerobotics/protobuf-go v1.33.1-0.20240516052628-4470bc019102 // aperture
1112
)
1213

@@ -180,7 +181,7 @@ require (
180181
github.com/dlclark/regexp2 v1.11.5 // indirect
181182
github.com/docker/cli v27.5.0+incompatible // indirect
182183
github.com/docker/distribution v2.8.3+incompatible // indirect
183-
github.com/docker/docker v27.5.0+incompatible // indirect
184+
github.com/docker/docker v28.1.1+incompatible // indirect
184185
github.com/docker/docker-credential-helpers v0.8.2 // indirect
185186
github.com/docker/go-connections v0.5.0 // indirect
186187
github.com/docker/go-units v0.5.0 // indirect
@@ -251,7 +252,7 @@ require (
251252
github.com/golangci/revgrep v0.8.0 // indirect
252253
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
253254
github.com/google/go-cmp v0.7.0 // indirect
254-
github.com/google/go-containerregistry v0.20.3 // indirect
255+
github.com/google/go-containerregistry v0.20.4-0.20250225234217-098045d5e61f // indirect
255256
github.com/google/go-github/v70 v70.0.0 // indirect
256257
github.com/google/go-querystring v1.1.0 // indirect
257258
github.com/google/ko v0.17.1 // indirect
@@ -344,6 +345,7 @@ require (
344345
github.com/mitchellh/mapstructure v1.5.0 // indirect
345346
github.com/mitchellh/reflectwalk v1.0.2 // indirect
346347
github.com/moby/docker-image-spec v1.3.1 // indirect
348+
github.com/moby/sys/sequential v0.6.0 // indirect
347349
github.com/moricho/tparallel v0.3.2 // indirect
348350
github.com/mr-tron/base58 v1.2.0 // indirect
349351
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect

‎go.sum.tools

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@ github.com/docker/cli v27.5.0+incompatible h1:aMphQkcGtpHixwwhAXJT1rrK/detk2JIvD
375375
github.com/docker/cli v27.5.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
376376
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
377377
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
378-
github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
379-
github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
378+
github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I=
379+
github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
380380
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
381381
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
382382
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -578,8 +578,6 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
578578
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
579579
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
580580
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
581-
github.com/google/go-containerregistry v0.20.3 h1:oNx7IdTI936V8CQRveCjaxOiegWwvM7kqkbXTpyiovI=
582-
github.com/google/go-containerregistry v0.20.3/go.mod h1:w00pIgBRDVUDFM6bq+Qx8lwNWK+cxgCuX1vd3PIBDNI=
583581
github.com/google/go-github/v70 v70.0.0 h1:/tqCp5KPrcvqCc7vIvYyFYTiCGrYvaWoYMGHSQbo55o=
584582
github.com/google/go-github/v70 v70.0.0/go.mod h1:xBUZgo8MI3lUL/hwxl3hlceJW1U8MVnXP3zUyI+rhQY=
585583
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
@@ -830,6 +828,10 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
830828
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
831829
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
832830
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
831+
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
832+
github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
833+
github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
834+
github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
833835
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
834836
github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
835837
github.com/moricho/tparallel v0.3.2 h1:odr8aZVFA3NZrNybggMkYO3rgPRcqjeQUlBBFVxKHTI=
@@ -903,6 +905,8 @@ github.com/paralin/anchore-go-macholibre v0.0.0-20240802084318-6c3d7de41333 h1:8
903905
github.com/paralin/anchore-go-macholibre v0.0.0-20240802084318-6c3d7de41333/go.mod h1:xz7uczAHBrEQ3+kIb4bnsp74JqcKpBid+gznZil1X0Q=
904906
github.com/paralin/anchore-quill v0.0.0-20240802084019-e89215594f6d h1:H/2lrCzxQKKGpt0Jh1vdf0jnIgJXEP9cCK4UPhxhSWM=
905907
github.com/paralin/anchore-quill v0.0.0-20240802084019-e89215594f6d/go.mod h1:d2weSmkaiWjIo/jR/3AhsuedYyZeibXfmJxV7qPd3Zk=
908+
github.com/paralin/go-containerregistry v0.20.4-0.20250428225319-e56496e419b1 h1:swBY7X9j8YJp9FX5ct48O/U5u0KWDEMZuBPadZVIp/s=
909+
github.com/paralin/go-containerregistry v0.20.4-0.20250428225319-e56496e419b1/go.mod h1:a88rK3Ga1+uN1gogYn4mhWUK2EBnFGcno7fXyPXJUBU=
906910
github.com/pborman/getopt v0.0.0-20180811024354-2b5b3bfb099b/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
907911
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
908912
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=

‎tools/go.mod

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ toolchain go1.24.2
77
replace github.com/aperturerobotics/common => ../
88

99
replace (
10-
github.com/docker/docker => github.com/docker/docker v28.0.1+incompatible
10+
github.com/docker/docker => github.com/docker/docker v28.1.1+incompatible // latest
11+
github.com/google/go-containerregistry => github.com/paralin/go-containerregistry v0.20.4-0.20250428225319-e56496e419b1 // update-docker
1112
google.golang.org/protobuf => github.com/aperturerobotics/protobuf-go v1.33.1-0.20240516052628-4470bc019102 // aperture
1213
)
1314

@@ -182,7 +183,7 @@ require (
182183
github.com/dlclark/regexp2 v1.11.5 // indirect
183184
github.com/docker/cli v27.5.0+incompatible // indirect
184185
github.com/docker/distribution v2.8.3+incompatible // indirect
185-
github.com/docker/docker v27.5.0+incompatible // indirect
186+
github.com/docker/docker v28.1.1+incompatible // indirect
186187
github.com/docker/docker-credential-helpers v0.8.2 // indirect
187188
github.com/docker/go-connections v0.5.0 // indirect
188189
github.com/docker/go-units v0.5.0 // indirect
@@ -253,7 +254,7 @@ require (
253254
github.com/golangci/revgrep v0.8.0 // indirect
254255
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
255256
github.com/google/go-cmp v0.7.0 // indirect
256-
github.com/google/go-containerregistry v0.20.3 // indirect
257+
github.com/google/go-containerregistry v0.20.4-0.20250225234217-098045d5e61f // indirect
257258
github.com/google/go-github/v70 v70.0.0 // indirect
258259
github.com/google/go-querystring v1.1.0 // indirect
259260
github.com/google/ko v0.17.1 // indirect
@@ -346,6 +347,7 @@ require (
346347
github.com/mitchellh/mapstructure v1.5.0 // indirect
347348
github.com/mitchellh/reflectwalk v1.0.2 // indirect
348349
github.com/moby/docker-image-spec v1.3.1 // indirect
350+
github.com/moby/sys/sequential v0.6.0 // indirect
349351
github.com/moricho/tparallel v0.3.2 // indirect
350352
github.com/mr-tron/base58 v1.2.0 // indirect
351353
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect

‎tools/go.sum

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@ github.com/docker/cli v27.5.0+incompatible h1:aMphQkcGtpHixwwhAXJT1rrK/detk2JIvD
375375
github.com/docker/cli v27.5.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
376376
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
377377
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
378-
github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
379-
github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
378+
github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I=
379+
github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
380380
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
381381
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
382382
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -578,8 +578,6 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
578578
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
579579
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
580580
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
581-
github.com/google/go-containerregistry v0.20.3 h1:oNx7IdTI936V8CQRveCjaxOiegWwvM7kqkbXTpyiovI=
582-
github.com/google/go-containerregistry v0.20.3/go.mod h1:w00pIgBRDVUDFM6bq+Qx8lwNWK+cxgCuX1vd3PIBDNI=
583581
github.com/google/go-github/v70 v70.0.0 h1:/tqCp5KPrcvqCc7vIvYyFYTiCGrYvaWoYMGHSQbo55o=
584582
github.com/google/go-github/v70 v70.0.0/go.mod h1:xBUZgo8MI3lUL/hwxl3hlceJW1U8MVnXP3zUyI+rhQY=
585583
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
@@ -830,6 +828,10 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
830828
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
831829
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
832830
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
831+
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
832+
github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
833+
github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
834+
github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
833835
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
834836
github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
835837
github.com/moricho/tparallel v0.3.2 h1:odr8aZVFA3NZrNybggMkYO3rgPRcqjeQUlBBFVxKHTI=
@@ -903,6 +905,8 @@ github.com/paralin/anchore-go-macholibre v0.0.0-20240802084318-6c3d7de41333 h1:8
903905
github.com/paralin/anchore-go-macholibre v0.0.0-20240802084318-6c3d7de41333/go.mod h1:xz7uczAHBrEQ3+kIb4bnsp74JqcKpBid+gznZil1X0Q=
904906
github.com/paralin/anchore-quill v0.0.0-20240802084019-e89215594f6d h1:H/2lrCzxQKKGpt0Jh1vdf0jnIgJXEP9cCK4UPhxhSWM=
905907
github.com/paralin/anchore-quill v0.0.0-20240802084019-e89215594f6d/go.mod h1:d2weSmkaiWjIo/jR/3AhsuedYyZeibXfmJxV7qPd3Zk=
908+
github.com/paralin/go-containerregistry v0.20.4-0.20250428225319-e56496e419b1 h1:swBY7X9j8YJp9FX5ct48O/U5u0KWDEMZuBPadZVIp/s=
909+
github.com/paralin/go-containerregistry v0.20.4-0.20250428225319-e56496e419b1/go.mod h1:a88rK3Ga1+uN1gogYn4mhWUK2EBnFGcno7fXyPXJUBU=
906910
github.com/pborman/getopt v0.0.0-20180811024354-2b5b3bfb099b/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
907911
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
908912
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=

0 commit comments

Comments
 (0)