Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package melange for openSUSE:Factory checked
in at 2024-12-23 16:54:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/melange (Old)
and /work/SRC/openSUSE:Factory/.melange.new.1881 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "melange"
Mon Dec 23 16:54:05 2024 rev:55 rq:1233108 version:0.18.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/melange/melange.changes 2024-12-16
19:11:24.928221817 +0100
+++ /work/SRC/openSUSE:Factory/.melange.new.1881/melange.changes
2024-12-23 16:54:07.123037341 +0100
@@ -1,0 +2,20 @@
+Mon Dec 23 06:59:51 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 0.18.2:
+ * update apko to 0.22.4
+ * build(deps): bump cloud.google.com/go/storage from 1.48.0 to
+ 1.49.0
+ * build(deps): bump google.golang.org/api from 0.211.0 to 0.214.0
+ * build(deps): bump the gomod group with 2 updates
+ * Fix numpy-test to work across python 3.12 to 3.13 transition.
+ (#1715)
+ * fix(qemu): remove redundant check
+ * bump: double-quote bumped version strings, avoid trailing
+ newline
+ * build(deps): bump actions/setup-go in the actions group
+ * build(deps): bump the gomod group with 2 updates
+ * fix linting
+ * respect ctx error
+ * fix(qemu): improve logging, make connection check less spammy
+
+-------------------------------------------------------------------
Old:
----
melange-0.18.1.obscpio
New:
----
melange-0.18.2.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ melange.spec ++++++
--- /var/tmp/diff_new_pack.UMEKQs/_old 2024-12-23 16:54:08.539095801 +0100
+++ /var/tmp/diff_new_pack.UMEKQs/_new 2024-12-23 16:54:08.539095801 +0100
@@ -17,7 +17,7 @@
Name: melange
-Version: 0.18.1
+Version: 0.18.2
Release: 0
Summary: Build APKs from source code
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.UMEKQs/_old 2024-12-23 16:54:08.567096957 +0100
+++ /var/tmp/diff_new_pack.UMEKQs/_new 2024-12-23 16:54:08.571097122 +0100
@@ -3,7 +3,7 @@
<param name="url">https://github.com/chainguard-dev/melange</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v0.18.1</param>
+ <param name="revision">v0.18.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.UMEKQs/_old 2024-12-23 16:54:08.591097948 +0100
+++ /var/tmp/diff_new_pack.UMEKQs/_new 2024-12-23 16:54:08.611098774 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/chainguard-dev/melange</param>
- <param
name="changesrevision">0e2b364c742c54b26ee60303b87abb3bb16c181d</param></service></servicedata>
+ <param
name="changesrevision">4cfdb707f1d39c5359cca35b4c22ec7b3e38d38e</param></service></servicedata>
(No newline at EOF)
++++++ melange-0.18.1.obscpio -> melange-0.18.2.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/.github/workflows/build.yaml
new/melange-0.18.2/.github/workflows/build.yaml
--- old/melange-0.18.1/.github/workflows/build.yaml 2024-12-14
02:04:18.000000000 +0100
+++ new/melange-0.18.2/.github/workflows/build.yaml 2024-12-21
16:45:53.000000000 +0100
@@ -21,7 +21,7 @@
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
- - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed #
v5.1.0
+ - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #
v5.2.0
with:
go-version-file: './go.mod'
check-latest: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/.github/workflows/e2e.yaml
new/melange-0.18.2/.github/workflows/e2e.yaml
--- old/melange-0.18.1/.github/workflows/e2e.yaml 2024-12-14
02:04:18.000000000 +0100
+++ new/melange-0.18.2/.github/workflows/e2e.yaml 2024-12-21
16:45:53.000000000 +0100
@@ -33,7 +33,7 @@
egress-policy: audit
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
- - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed #
v5.1.0
+ - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #
v5.2.0
with:
go-version-file: "go.mod"
- name: Build package
@@ -86,7 +86,7 @@
egress-policy: audit
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
- - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed #
v5.1.0
+ - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #
v5.2.0
with:
go-version-file: "go.mod"
- name: Mark workspace as a safe repository
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/.github/workflows/go-tests.yaml
new/melange-0.18.2/.github/workflows/go-tests.yaml
--- old/melange-0.18.1/.github/workflows/go-tests.yaml 2024-12-14
02:04:18.000000000 +0100
+++ new/melange-0.18.2/.github/workflows/go-tests.yaml 2024-12-21
16:45:53.000000000 +0100
@@ -21,7 +21,7 @@
- name: Checkout code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
- - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed #
v5.1.0
+ - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #
v5.2.0
with:
go-version-file: './go.mod'
check-latest: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/melange-0.18.1/.github/workflows/melange-test-pipelines.yaml
new/melange-0.18.2/.github/workflows/melange-test-pipelines.yaml
--- old/melange-0.18.1/.github/workflows/melange-test-pipelines.yaml
2024-12-14 02:04:18.000000000 +0100
+++ new/melange-0.18.2/.github/workflows/melange-test-pipelines.yaml
2024-12-21 16:45:53.000000000 +0100
@@ -21,7 +21,7 @@
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
- - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed #
v5.1.0
+ - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #
v5.2.0
with:
go-version-file: './go.mod'
check-latest: true
@@ -67,7 +67,7 @@
sudo apt-get -y install bubblewrap
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
- - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed #
v5.1.0
+ - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #
v5.2.0
with:
go-version-file: './go.mod'
check-latest: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/.github/workflows/release.yaml
new/melange-0.18.2/.github/workflows/release.yaml
--- old/melange-0.18.1/.github/workflows/release.yaml 2024-12-14
02:04:18.000000000 +0100
+++ new/melange-0.18.2/.github/workflows/release.yaml 2024-12-21
16:45:53.000000000 +0100
@@ -56,7 +56,7 @@
with:
ref: ${{ steps.check.outputs.existing_tag ||
steps.create_tag.outputs.new_tag }}
- - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed #
v5.1.0
+ - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #
v5.2.0
if: steps.check.outputs.need_release == 'yes'
with:
go-version-file: './go.mod'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/.github/workflows/verify.yaml
new/melange-0.18.2/.github/workflows/verify.yaml
--- old/melange-0.18.1/.github/workflows/verify.yaml 2024-12-14
02:04:18.000000000 +0100
+++ new/melange-0.18.2/.github/workflows/verify.yaml 2024-12-21
16:45:53.000000000 +0100
@@ -21,7 +21,7 @@
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
- - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed #
v5.1.0
+ - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #
v5.2.0
with:
go-version-file: go.mod
check-latest: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/melange-0.18.1/.github/workflows/wolfi-presubmit.yaml
new/melange-0.18.2/.github/workflows/wolfi-presubmit.yaml
--- old/melange-0.18.1/.github/workflows/wolfi-presubmit.yaml 2024-12-14
02:04:18.000000000 +0100
+++ new/melange-0.18.2/.github/workflows/wolfi-presubmit.yaml 2024-12-21
16:45:53.000000000 +0100
@@ -21,7 +21,7 @@
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #
v4.2.2
- - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed #
v5.1.0
+ - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #
v5.2.0
with:
go-version-file: './go.mod'
check-latest: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/e2e-tests/numpy-test.yaml
new/melange-0.18.2/e2e-tests/numpy-test.yaml
--- old/melange-0.18.1/e2e-tests/numpy-test.yaml 2024-12-14
02:04:18.000000000 +0100
+++ new/melange-0.18.2/e2e-tests/numpy-test.yaml 2024-12-21
16:45:53.000000000 +0100
@@ -8,16 +8,7 @@
# Test python/import, and python/test pipelines
test:
- environment:
- # TODO(pnasrat): fix to use multiple python
- contents:
- packages:
- - python-3.13
pipeline:
- # Test import with command (python -c "import numpy")
- - uses: python/test
- with:
- command: python3.13 -c "import numpy"
# Test import directly (python -c "import numpy")
- uses: python/import
with:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/go.mod new/melange-0.18.2/go.mod
--- old/melange-0.18.1/go.mod 2024-12-14 02:04:18.000000000 +0100
+++ new/melange-0.18.2/go.mod 2024-12-21 16:45:53.000000000 +0100
@@ -3,15 +3,15 @@
go 1.23.3
require (
- chainguard.dev/apko v0.22.1
- cloud.google.com/go/storage v1.48.0
+ chainguard.dev/apko v0.22.4
+ cloud.google.com/go/storage v1.49.0
dagger.io/dagger v0.15.1
github.com/chainguard-dev/clog v1.5.1
github.com/chainguard-dev/go-pkgconfig
v0.0.0-20240404163941-6351b37b2a10
- github.com/chainguard-dev/yam v0.2.4
+ github.com/chainguard-dev/yam v0.2.5
github.com/charmbracelet/log v0.4.0
- github.com/docker/cli v27.4.0+incompatible
- github.com/docker/docker v27.4.0+incompatible
+ github.com/docker/cli v27.4.1+incompatible
+ github.com/docker/docker v27.4.1+incompatible
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936
github.com/github/go-spdx/v2 v2.3.2
github.com/go-git/go-git/v5 v5.12.0
@@ -44,7 +44,7 @@
golang.org/x/sys v0.28.0
golang.org/x/text v0.21.0
golang.org/x/time v0.8.0
- google.golang.org/api v0.211.0
+ google.golang.org/api v0.214.0
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
@@ -59,19 +59,19 @@
)
require (
- cel.dev/expr v0.16.1 // indirect
+ cel.dev/expr v0.16.2 // indirect
chainguard.dev/go-grpc-kit v0.17.7 // indirect
chainguard.dev/sdk v0.1.29 // indirect
cloud.google.com/go v0.116.0 // indirect
- cloud.google.com/go/auth v0.12.1 // indirect
+ cloud.google.com/go/auth v0.13.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
- cloud.google.com/go/compute/metadata v0.5.2 // indirect
+ cloud.google.com/go/compute/metadata v0.6.0 // indirect
cloud.google.com/go/iam v1.2.2 // indirect
cloud.google.com/go/monitoring v1.21.2 // indirect
filippo.io/edwards25519 v1.1.0 // indirect
github.com/99designs/gqlgen v0.17.57 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 //
indirect
-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp
v1.24.1 // indirect
+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp
v1.25.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric
v0.48.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping
v0.48.1 // indirect
github.com/Khan/genqlient v0.7.0 // indirect
@@ -105,7 +105,7 @@
github.com/docker/go-units v0.5.0 // indirect
github.com/dominodatalab/os-release v0.0.0-20190522011736-bcdb4a3e3c2f
// indirect
github.com/emirpasic/gods v1.18.1 // indirect
- github.com/envoyproxy/go-control-plane v0.13.0 // indirect
+ github.com/envoyproxy/go-control-plane v0.13.1 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-chi/chi v4.1.2+incompatible // indirect
@@ -194,7 +194,7 @@
go.mongodb.org/mongo-driver v1.17.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
- go.opentelemetry.io/contrib/detectors/gcp v1.29.0 // indirect
+ go.opentelemetry.io/contrib/detectors/gcp v1.31.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.57.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
// indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc
v0.0.0-20240518090000-14441aefdf88 // indirect
@@ -207,22 +207,21 @@
go.opentelemetry.io/otel/log v0.3.0 // indirect
go.opentelemetry.io/otel/metric v1.33.0 // indirect
go.opentelemetry.io/otel/sdk/log v0.3.0 // indirect
- go.opentelemetry.io/otel/sdk/metric v1.29.0 // indirect
+ go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.33.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
- go.step.sm/crypto v0.55.0 // indirect
+ go.step.sm/crypto v0.56.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/mod v0.22.0 // indirect
- golang.org/x/net v0.32.0 // indirect
+ golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/term v0.27.0 // indirect
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 //
indirect
google.golang.org/genproto/googleapis/api
v0.0.0-20241209162323-e6fa225c2576 // indirect
google.golang.org/genproto/googleapis/rpc
v0.0.0-20241209162323-e6fa225c2576 // indirect
- google.golang.org/grpc v1.68.1 // indirect
- google.golang.org/grpc/stats/opentelemetry
v0.0.0-20240907200651-3ffb98b2c93a // indirect
- google.golang.org/protobuf v1.35.2 // indirect
+ google.golang.org/grpc v1.69.2 // indirect
+ google.golang.org/protobuf v1.36.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
k8s.io/apimachinery v0.32.0 // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/go.sum new/melange-0.18.2/go.sum
--- old/melange-0.18.1/go.sum 2024-12-14 02:04:18.000000000 +0100
+++ new/melange-0.18.2/go.sum 2024-12-21 16:45:53.000000000 +0100
@@ -1,7 +1,7 @@
-cel.dev/expr v0.16.1 h1:NR0+oFYzR1CqLFhTAqg3ql59G9VfN8fKq1TCHJ6gq1g=
-cel.dev/expr v0.16.1/go.mod h1:AsGA5zb3WruAEQeQng1RZdGEXmBj0jvMWh6l5SnNuC8=
-chainguard.dev/apko v0.22.1 h1:AIDhTQy68HdL9JNZ9uDfCbg8GeGya4qRMSbxDI9Kwbw=
-chainguard.dev/apko v0.22.1/go.mod
h1:lgMMzODIxGo0/NtcZ1sq26jbgniJgLkIFIa6L3xDGNs=
+cel.dev/expr v0.16.2 h1:RwRhoH17VhAu9U5CMvMhH1PDVgf0tuz9FT+24AfMLfU=
+cel.dev/expr v0.16.2/go.mod h1:gXngZQMkWJoSbE8mOzehJlXQyubn/Vg0vR9/F3W7iw8=
+chainguard.dev/apko v0.22.4 h1:DqLeqVijEMhFH6PhYYEry+3vPcd2DwHbV89MK3tw4e0=
+chainguard.dev/apko v0.22.4/go.mod
h1:QA+Bl4DgHNlDqpPUt9J2+JT+CaGtp2v1VyYNmwNgRq4=
chainguard.dev/go-grpc-kit v0.17.7
h1:TqHua7er5k8m6WM96y0Tm7IoLLkuZ5vh3+5SR1gruKg=
chainguard.dev/go-grpc-kit v0.17.7/go.mod
h1:JroMzTY9mdhKe/bvtyChgfECaNh80+bMZH3HS+TGXHw=
chainguard.dev/sdk v0.1.29 h1:GNcCw5NoyvylhlUbVD8JMmrPaeYyrshaHHjEWnvcCGI=
@@ -9,12 +9,12 @@
cloud.google.com/go v0.26.0/go.mod
h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
cloud.google.com/go v0.116.0/go.mod
h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U=
-cloud.google.com/go/auth v0.12.1
h1:n2Bj25BUMM0nvE9D2XLTiImanwZhO3DkfWSYS/SAJP4=
-cloud.google.com/go/auth v0.12.1/go.mod
h1:BFMu+TNpF3DmvfBO9ClqTR/SiqVIm7LukKF9mbendF4=
+cloud.google.com/go/auth v0.13.0
h1:8Fu8TZy167JkW8Tj3q7dIkr2v4cndv41ouecJx0PAHs=
+cloud.google.com/go/auth v0.13.0/go.mod
h1:COOjD9gwfKNKz+IIduatIhYJQIc0mG3H102r/EMxX6Q=
cloud.google.com/go/auth/oauth2adapt v0.2.6
h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU=
cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod
h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
-cloud.google.com/go/compute/metadata v0.5.2
h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo=
-cloud.google.com/go/compute/metadata v0.5.2/go.mod
h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k=
+cloud.google.com/go/compute/metadata v0.6.0
h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
+cloud.google.com/go/compute/metadata v0.6.0/go.mod
h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
cloud.google.com/go/iam v1.2.2 h1:ozUSofHUGf/F4tCNy/mu9tHLTaxZFLOUiKzjcgWHGIA=
cloud.google.com/go/iam v1.2.2/go.mod
h1:0Ys8ccaZHdI1dEUilwzqng/6ps2YB6vRsjIe00/+6JY=
cloud.google.com/go/logging v1.12.0
h1:ex1igYcGFd4S/RZWOCU51StlIEuey5bjqwH9ZYjHibk=
@@ -23,8 +23,8 @@
cloud.google.com/go/longrunning v0.6.2/go.mod
h1:k/vIs83RN4bE3YCswdXC5PFfWVILjm3hpEUlSko4PiI=
cloud.google.com/go/monitoring v1.21.2
h1:FChwVtClH19E7pJ+e0xUhJPGksctZNVOk2UhMmblmdU=
cloud.google.com/go/monitoring v1.21.2/go.mod
h1:hS3pXvaG8KgWTSz+dAdyzPrGUYmi2Q+WFX8g2hqVEZU=
-cloud.google.com/go/storage v1.48.0
h1:FhBDHACbVtdPx7S/AbcKujPWiHvfO6F8OXGgCEbB2+o=
-cloud.google.com/go/storage v1.48.0/go.mod
h1:aFoDYNMAjv67lp+xcuZqjUKv/ctmplzQ3wJgodA7b+M=
+cloud.google.com/go/storage v1.49.0
h1:zenOPBOWHCnojRd9aJZAyQXBYqkJkdQS42dxL55CIMw=
+cloud.google.com/go/storage v1.49.0/go.mod
h1:k1eHhhpLvrPjVGfo0mOUPEJ4Y2+a/Hv5PiwehZI9qGU=
cloud.google.com/go/trace v1.11.2
h1:4ZmaBdL8Ng/ajrgKqY5jfvzqMXbrDcBsUGXOT9aqTtI=
cloud.google.com/go/trace v1.11.2/go.mod
h1:bn7OwXd4pd5rFuAnTrzBuoZ4ax2XQeG3qNgYmfCy0Io=
dagger.io/dagger v0.15.1 h1:2faeBRf/3gTPGcjcej44fu/V81SIDhu+UjYn3hUJuIE=
@@ -38,8 +38,8 @@
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161
h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod
h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
github.com/BurntSushi/toml v0.3.1/go.mod
h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp
v1.24.1 h1:pB2F2JKCj1Znmp2rwxxt1J0Fg0wezTMgWYk5Mpbi1kg=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp
v1.24.1/go.mod h1:itPGVDKf9cC/ov4MdvJ2QZ0khw4bfoo9jzwTJlaxy2k=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp
v1.25.0 h1:3c8yed4lgqTt+oTQ+JNMDo+F4xprBf+O/il4ZC0nRLw=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp
v1.25.0/go.mod h1:obipzmGjfSjam60XLwGfqUkJsfiheAl+TUjG+4yzyPM=
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric
v0.48.1 h1:UQ0AhxogsIRZDkElkblfnwjc3IaltCm2HUMvezQaL7s=
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric
v0.48.1/go.mod h1:jyqM3eLpJ3IbIFDTKVz2rF9T/xWGW0rIriGwnz8l9Tk=
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock
v0.48.1 h1:oTX4vsorBZo/Zdum6OKPA4o7544hm6smoRv1QjpTwGo=
@@ -91,8 +91,8 @@
github.com/chainguard-dev/git-urls v1.0.2/go.mod
h1:rbGgj10OS7UgZlbzdUQIQpT0k/D4+An04HJY7Ol+Y/o=
github.com/chainguard-dev/go-pkgconfig v0.0.0-20240404163941-6351b37b2a10
h1:XR2vgQC024I9/boh9r1ihVv8Z14+pbvWqXeYMCnZJpc=
github.com/chainguard-dev/go-pkgconfig
v0.0.0-20240404163941-6351b37b2a10/go.mod
h1:1p6+MesLcjKeON5BRWa7I87mvAY0QmKjgginIM3w6BI=
-github.com/chainguard-dev/yam v0.2.4
h1://jh+1dbKkatmR7HESkIGOvZarA4/Tayu9WK/RrKSuY=
-github.com/chainguard-dev/yam v0.2.4/go.mod
h1:ON4NuAkA+DKjDul+AleGBxJ9ga04udJhuFLnVXwiyU0=
+github.com/chainguard-dev/yam v0.2.5
h1:KEQ6GvIVP3xK4dnKJRdmeS1065PF0gLxi+HjlhtNvjI=
+github.com/chainguard-dev/yam v0.2.5/go.mod
h1:ON4NuAkA+DKjDul+AleGBxJ9ga04udJhuFLnVXwiyU0=
github.com/charmbracelet/lipgloss v1.0.0
h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
github.com/charmbracelet/lipgloss v1.0.0/go.mod
h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
github.com/charmbracelet/log v0.4.0
h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
@@ -129,12 +129,12 @@
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/distribution/reference v0.6.0
h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod
h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/cli v27.4.0+incompatible
h1:/nJzWkcI1MDMN+U+px/YXnQWJqnu4J+QKGTfD6ptiTc=
-github.com/docker/cli v27.4.0+incompatible/go.mod
h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v27.4.1+incompatible
h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI=
+github.com/docker/cli v27.4.1+incompatible/go.mod
h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
github.com/docker/distribution v2.8.3+incompatible
h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
github.com/docker/distribution v2.8.3+incompatible/go.mod
h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v27.4.0+incompatible
h1:I9z7sQ5qyzO0BfAb9IMOawRkAGxhYsidKiTMcm0DU+A=
-github.com/docker/docker v27.4.0+incompatible/go.mod
h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v27.4.1+incompatible
h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4=
+github.com/docker/docker v27.4.1+incompatible/go.mod
h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker-credential-helpers v0.8.2
h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
github.com/docker/docker-credential-helpers v0.8.2/go.mod
h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
github.com/docker/go-connections v0.5.0
h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -154,8 +154,8 @@
github.com/envoyproxy/go-control-plane v0.9.0/go.mod
h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane
v0.9.1-0.20191026205805-5f8ba28d4473/go.mod
h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod
h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.13.0
h1:HzkeUz1Knt+3bK+8LG1bxOO/jzWZmdxpwC51i202les=
-github.com/envoyproxy/go-control-plane v0.13.0/go.mod
h1:GRaKG3dwvFoTg4nj7aXdZnvMg4d7nvT/wl9WgVXn3Q8=
+github.com/envoyproxy/go-control-plane v0.13.1
h1:vPfJZCkob6yTMEgS+0TwfTUfbHjfy/6vOJ8hUWX/uXE=
+github.com/envoyproxy/go-control-plane v0.13.1/go.mod
h1:X45hY0mufo6Fd0KW3rqsGvQMw58jvjymeCzBU3mWyHw=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod
h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/envoyproxy/protoc-gen-validate v1.1.0
h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM=
github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod
h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4=
@@ -503,8 +503,8 @@
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.opentelemetry.io/auto/sdk v1.1.0
h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
go.opentelemetry.io/auto/sdk v1.1.0/go.mod
h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/detectors/gcp v1.29.0
h1:TiaiXB4DpGD3sdzNlYQxruQngn5Apwzi1X0DRhuGvDQ=
-go.opentelemetry.io/contrib/detectors/gcp v1.29.0/go.mod
h1:GW2aWZNwR2ZxDLdv8OyC2G8zkRoQBuURgV7RPQgcPoU=
+go.opentelemetry.io/contrib/detectors/gcp v1.31.0
h1:G1JQOreVrfhRkner+l4mrGxmfqYCAuy76asTDAo0xsA=
+go.opentelemetry.io/contrib/detectors/gcp v1.31.0/go.mod
h1:tzQL6E1l+iV44YFTkcAeNQqzXUiekSYP9jjJjXwEd00=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.57.0 h1:qtFISDHKolvIxzSs0gIaiPUPR0Cucb0F2coHC7ZLdps=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.57.0/go.mod h1:Y+Pop1Q6hCOnETWTW4NROK/q1hv50hM7yDaUTjG8lp8=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
h1:DheMAlT6POBP+gh8RUH19EOTnQIor5QE0uSRPtzCpSw=
@@ -537,14 +537,14 @@
go.opentelemetry.io/otel/sdk v1.33.0/go.mod
h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
go.opentelemetry.io/otel/sdk/log v0.3.0
h1:GEjJ8iftz2l+XO1GF2856r7yYVh74URiF9JMcAacr5U=
go.opentelemetry.io/otel/sdk/log v0.3.0/go.mod
h1:BwCxtmux6ACLuys1wlbc0+vGBd+xytjmjajwqqIul2g=
-go.opentelemetry.io/otel/sdk/metric v1.29.0
h1:K2CfmJohnRgvZ9UAj2/FhIf/okdWcNdBwe1m8xFXiSY=
-go.opentelemetry.io/otel/sdk/metric v1.29.0/go.mod
h1:6zZLdCl2fkauYoZIOn/soQIDSWFmNSRcICarHfuhNJQ=
+go.opentelemetry.io/otel/sdk/metric v1.31.0
h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc=
+go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod
h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8=
go.opentelemetry.io/otel/trace v1.33.0
h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
go.opentelemetry.io/otel/trace v1.33.0/go.mod
h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
go.opentelemetry.io/proto/otlp v1.3.1
h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
go.opentelemetry.io/proto/otlp v1.3.1/go.mod
h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
-go.step.sm/crypto v0.55.0 h1:575Q7NahuM/ZRxUVN1GkO2e1aDYQJqIIg+nbfOajQJk=
-go.step.sm/crypto v0.55.0/go.mod
h1:MgEmD1lgwsuzZwTgI0GwKapHjKVEQLVggSvHuf3bYnU=
+go.step.sm/crypto v0.56.0 h1:KcFfV76cI9Xaw8bdSc9x55skyuSdcHcTdL37vvVZnvY=
+go.step.sm/crypto v0.56.0/go.mod
h1:snWNloxY9s1W+HsFqcviq55nvzbqqX6LxVt0Vktv5mw=
go.uber.org/atomic v1.7.0/go.mod
h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/goleak v1.1.10/go.mod
h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -595,8 +595,8 @@
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod
h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod
h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
golang.org/x/oauth2 v0.24.0/go.mod
h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
@@ -673,8 +673,8 @@
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.211.0 h1:IUpLjq09jxBSV1lACO33CGY3jsRcbctfGzhj+ZSE/Bg=
-google.golang.org/api v0.211.0/go.mod
h1:XOloB4MXFH4UTlQSGuNUxw0UT74qdENK8d6JNsXKLi0=
+google.golang.org/api v0.214.0 h1:h2Gkq07OYi6kusGOaT/9rnNljuXmqPnaig7WGPmKbwA=
+google.golang.org/api v0.214.0/go.mod
h1:bYPpLG8AyeMWwDU6NXoB00xC0DFkikVvd5MfwoxjLqE=
google.golang.org/appengine v1.1.0/go.mod
h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod
h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod
h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -694,10 +694,8 @@
google.golang.org/grpc v1.27.0/go.mod
h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.29.1/go.mod
h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
google.golang.org/grpc v1.33.2/go.mod
h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-google.golang.org/grpc v1.68.1/go.mod
h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
-google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a
h1:UIpYSuWdWHSzjwcAFRLjKcPXFZVVLXGEM23W+NWqipw=
-google.golang.org/grpc/stats/opentelemetry
v0.0.0-20240907200651-3ffb98b2c93a/go.mod
h1:9i1T9n4ZinTUZGgzENMi8MDDgbGC5mqTS75JAv6xN3A=
+google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
+google.golang.org/grpc v1.69.2/go.mod
h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod
h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod
h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod
h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -709,8 +707,8 @@
google.golang.org/protobuf v1.25.0/go.mod
h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod
h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod
h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.35.2
h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod
h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.0
h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
+google.golang.org/protobuf v1.36.0/go.mod
h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/pkg/build/build_test.go
new/melange-0.18.2/pkg/build/build_test.go
--- old/melange-0.18.1/pkg/build/build_test.go 2024-12-14 02:04:18.000000000
+0100
+++ new/melange-0.18.2/pkg/build/build_test.go 2024-12-21 16:45:53.000000000
+0100
@@ -37,6 +37,7 @@
// TestConfiguration_Load is the main set of tests for loading a configuration
// file. When in doubt, add your test here.
func TestConfiguration_Load(t *testing.T) {
+ gid1000 := uint32(1000)
tests := []struct {
name string
skipConfigCleanStep bool
@@ -208,7 +209,7 @@
"GOPATH":
"/var/cache/melange/go",
},
Accounts: apko_types.ImageAccounts{
- Users:
[]apko_types.User{{UserName: "build", UID: 1000, GID: 1000}},
+ Users:
[]apko_types.User{{UserName: "build", UID: 1000, GID:
apko_types.GID(&gid1000)}},
Groups:
[]apko_types.Group{{GroupName: "build", GID: 1000, Members: []string{"build"}}},
},
},
@@ -282,10 +283,11 @@
},
Subpackages: []config.Subpackage{},
}
+ gid1000 := uint32(1000)
expected.Environment.Accounts.Users = []apko_types.User{{
UserName: "build",
UID: 1000,
- GID: 1000,
+ GID: apko_types.GID(&gid1000),
}}
expected.Environment.Accounts.Groups = []apko_types.Group{{
GroupName: "build",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/pkg/config/config.go
new/melange-0.18.2/pkg/config/config.go
--- old/melange-0.18.1/pkg/config/config.go 2024-12-14 02:04:18.000000000
+0100
+++ new/melange-0.18.2/pkg/config/config.go 2024-12-21 16:45:53.000000000
+0100
@@ -1348,10 +1348,11 @@
}
cfg.Environment.Accounts.Groups =
append(cfg.Environment.Accounts.Groups, grp)
+ gid1000 := uint32(1000)
usr := apko_types.User{
UserName: "build",
UID: 1000,
- GID: 1000,
+ GID: apko_types.GID(&gid1000),
}
cfg.Environment.Accounts.Users = append(cfg.Environment.Accounts.Users,
usr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/pkg/container/qemu_runner.go
new/melange-0.18.2/pkg/container/qemu_runner.go
--- old/melange-0.18.1/pkg/container/qemu_runner.go 2024-12-14
02:04:18.000000000 +0100
+++ new/melange-0.18.2/pkg/container/qemu_runner.go 2024-12-21
16:45:53.000000000 +0100
@@ -77,7 +77,6 @@
// Run runs a Qemu task given a Config and command string.
func (bw *qemu) Run(ctx context.Context, cfg *Config, envOverride
map[string]string, args ...string) error {
log := clog.FromContext(ctx)
- log.Debugf("running command %s", strings.Join(args, " "))
stdout, stderr := logwriter.New(log.Info), logwriter.New(log.Warn)
defer stdout.Close()
defer stderr.Close()
@@ -450,14 +449,21 @@
retries := 6000
try := 0
for try <= retries {
+ if err := ctx.Err(); err != nil {
+ return fmt.Errorf("checking SSH server: %w", err)
+ }
+
+ try++
+ time.Sleep(time.Millisecond * 500)
+
clog.FromContext(ctx).Infof("qemu: waiting for ssh to come up,
try %d of %d", try, retries)
// Attempt to connect to the address
err = checkSSHServer(cfg.SSHAddress)
if err == nil {
break
+ } else {
+ clog.FromContext(ctx).Debug(err.Error())
}
- try++
- time.Sleep(time.Millisecond * 200)
}
if try >= retries {
// ensure cleanup of resources
@@ -495,9 +501,9 @@
clog.FromContext(ctx).Debug("qemu: setting up kernel for vm")
kernel := "/boot/vmlinuz"
if kernelVar, ok := os.LookupEnv("QEMU_KERNEL_IMAGE"); ok {
- clog.FromContext(ctx).Info("qemu: QEMU_KERNEL_IMAGE env set")
+ clog.FromContext(ctx).Debug("qemu: QEMU_KERNEL_IMAGE env set")
if _, err := os.Stat(kernelVar); err == nil {
- clog.FromContext(ctx).Infof("qemu: local
QEMU_KERNEL_IMAGE file detected, using: %s", kernelVar)
+ clog.FromContext(ctx).Debugf("qemu: local
QEMU_KERNEL_IMAGE file detected, using: %s", kernelVar)
kernel = kernelVar
}
} else if _, err := os.Stat(kernel); err != nil {
@@ -620,32 +626,31 @@
// this avoids the ssh client trying to connect on a booting server.
func checkSSHServer(address string) error {
// Establish a connection to the address
- conn, err := net.DialTimeout("tcp", address, time.Millisecond*500)
+ conn, err := net.DialTimeout("tcp", address, time.Second)
if err != nil {
- return err
+ return fmt.Errorf("dial: %w", err)
}
defer conn.Close()
// Set a deadline for the connection
- err = conn.SetDeadline(time.Now().Add(time.Millisecond * 500))
+ err = conn.SetDeadline(time.Now().Add(time.Second * 15))
if err != nil {
return err
}
-
// Read the SSH banner
buffer := make([]byte, 255)
n, err := conn.Read(buffer)
if err != nil {
- return err
+ return fmt.Errorf("conn read: %w", err)
}
// Check if the banner starts with "SSH-"
banner := string(buffer[:n])
- if len(banner) >= 4 && banner[:4] == "SSH-" {
- return err
+ if strings.Contains(banner, "SSH-2.0-OpenSSH") {
+ return nil
}
- return nil
+ return fmt.Errorf("ssh: unknown connection error")
}
func getHostKey(ctx context.Context, cfg *Config) error {
@@ -664,7 +669,7 @@
ssh.PublicKeys(signer),
},
Config: ssh.Config{
- Ciphers: []string{"aes128-ctr"},
+ Ciphers: []string{"aes128-ctr",
"aes256-...@openssh.com"},
},
HostKeyCallback: func(hostname string, remote net.Addr, key
ssh.PublicKey) error {
hostKey = key
@@ -725,7 +730,7 @@
ssh.PublicKeys(signer),
},
Config: ssh.Config{
- Ciphers: []string{"aes128-ctr"},
+ Ciphers: []string{"aes128-ctr",
"aes256-...@openssh.com"},
},
HostKeyCallback: hostKeyCallback,
}
@@ -780,7 +785,7 @@
cmd := shellquote.Join(command...)
- clog.FromContext(ctx).Infof("running (%d) %v", len(command), cmd)
+ clog.FromContext(ctx).Debugf("running (%d) %v", len(command), cmd)
err = session.Run(cmd)
if err != nil {
clog.FromContext(ctx).Errorf("Failed to run command: %v", err)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/pkg/renovate/bump/bump.go
new/melange-0.18.2/pkg/renovate/bump/bump.go
--- old/melange-0.18.1/pkg/renovate/bump/bump.go 2024-12-14
02:04:18.000000000 +0100
+++ new/melange-0.18.2/pkg/renovate/bump/bump.go 2024-12-21
16:45:53.000000000 +0100
@@ -105,8 +105,8 @@
epochNode.Value = fmt.Sprintf("%d", epoch+1)
}
- versionNode.Value = bcfg.TargetVersion
- versionNode.Style = yaml.FlowStyle
+ versionNode.Value = strings.TrimSpace(bcfg.TargetVersion)
+ versionNode.Style = yaml.DoubleQuotedStyle
versionNode.Tag = "!!str"
rc.Vars[config.SubstitutionPackageVersion] = bcfg.TargetVersion
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/melange-0.18.1/pkg/renovate/bump/bump_test.go
new/melange-0.18.2/pkg/renovate/bump/bump_test.go
--- old/melange-0.18.1/pkg/renovate/bump/bump_test.go 2024-12-14
02:04:18.000000000 +0100
+++ new/melange-0.18.2/pkg/renovate/bump/bump_test.go 2024-12-21
16:45:53.000000000 +0100
@@ -24,9 +24,9 @@
newVersion string
expectedVersion string
}{
- {name: "float_issue.yaml", newVersion: "7.0.1",
expectedVersion: "version: 7.0.1"},
- {name: "quoted.yaml", newVersion: "7.0.1", expectedVersion:
"version: 7.0.1"},
- {name: "major_minor_patch.yaml", newVersion: "7.0.1",
expectedVersion: "version: 7.0.1"},
+ {name: "float_issue.yaml", newVersion: "7.0.1",
expectedVersion: `version: "7.0.1"`},
+ {name: "quoted.yaml", newVersion: "7.0.1", expectedVersion:
`version: "7.0.1"`},
+ {name: "major_minor_patch.yaml", newVersion: "7.0.1",
expectedVersion: `version: "7.0.1"`},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
++++++ melange.obsinfo ++++++
--- /var/tmp/diff_new_pack.UMEKQs/_old 2024-12-23 16:54:08.919111489 +0100
+++ /var/tmp/diff_new_pack.UMEKQs/_new 2024-12-23 16:54:08.919111489 +0100
@@ -1,5 +1,5 @@
name: melange
-version: 0.18.1
-mtime: 1734138258
-commit: 0e2b364c742c54b26ee60303b87abb3bb16c181d
+version: 0.18.2
+mtime: 1734795953
+commit: 4cfdb707f1d39c5359cca35b4c22ec7b3e38d38e
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/melange/vendor.tar.gz
/work/SRC/openSUSE:Factory/.melange.new.1881/vendor.tar.gz differ: char 5, line
1
