From 26a849e582bad1de30b2ddc74076208c74330bd0 Mon Sep 17 00:00:00 2001 From: Stephan D Date: Wed, 19 Nov 2025 12:34:44 +0100 Subject: [PATCH] version bump --- .gitignore | 2 + api/billing/fees/go.mod | 4 +- api/billing/fees/go.sum | 4 + api/chain/gateway/go.mod | 6 +- api/chain/gateway/go.sum | 6 + api/fx/ingestor/go.mod | 4 +- api/fx/ingestor/go.sum | 4 + api/fx/oracle/go.mod | 4 +- api/fx/oracle/go.sum | 4 + api/ledger/go.mod | 4 +- api/ledger/go.sum | 4 + api/notification/go.mod | 4 +- api/notification/go.sum | 4 + api/payments/orchestrator/go.mod | 4 +- api/payments/orchestrator/go.sum | 4 + api/pkg/go.mod | 12 +- api/pkg/go.sum | 8 + ci/scripts/common/bump_version.sh | 239 ++- frontend/.DS_Store | Bin 8196 -> 0 bytes frontend/pshared/lib/api/requests/.DS_Store | Bin 6148 -> 0 bytes frontend/pshared/lib/data/mapper/.DS_Store | Bin 6148 -> 0 bytes .../pshared/lib/models/storable/.DS_Store | Bin 6148 -> 0 bytes frontend/pweb/pubspec.lock | 1334 ----------------- 23 files changed, 254 insertions(+), 1401 deletions(-) delete mode 100644 frontend/.DS_Store delete mode 100644 frontend/pshared/lib/api/requests/.DS_Store delete mode 100644 frontend/pshared/lib/data/mapper/.DS_Store delete mode 100644 frontend/pshared/lib/models/storable/.DS_Store delete mode 100644 frontend/pweb/pubspec.lock diff --git a/.gitignore b/.gitignore index 7ee1fdd..d73c05b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ .env.version *.pb.go *.pb.gw.go +pubspec.lock +.DS_Store diff --git a/api/billing/fees/go.mod b/api/billing/fees/go.mod index 1c5aea6..10bae4f 100644 --- a/api/billing/fees/go.mod +++ b/api/billing/fees/go.mod @@ -11,7 +11,7 @@ require ( github.com/tech/sendico/pkg v0.1.0 go.mongodb.org/mongo-driver v1.17.6 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.76.0 + google.golang.org/grpc v1.77.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -36,7 +36,7 @@ require ( github.com/nats-io/nuid v1.0.1 // indirect github.com/prometheus/client_golang v1.23.2 github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.67.2 // indirect + github.com/prometheus/common v0.67.3 // indirect github.com/prometheus/procfs v0.19.2 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect diff --git a/api/billing/fees/go.sum b/api/billing/fees/go.sum index b00a4ba..13a4a5d 100644 --- a/api/billing/fees/go.sum +++ b/api/billing/fees/go.sum @@ -119,6 +119,8 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8= github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko= +github.com/prometheus/common v0.67.3 h1:shd26MlnwTw5jksTDhC7rTQIteBxy+ZZDr3t7F2xN2Q= +github.com/prometheus/common v0.67.3/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI= github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws= github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -218,6 +220,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= +google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM= +google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/api/chain/gateway/go.mod b/api/chain/gateway/go.mod index 91cf4f5..3f79cec 100644 --- a/api/chain/gateway/go.mod +++ b/api/chain/gateway/go.mod @@ -15,14 +15,14 @@ require ( github.com/tech/sendico/pkg v0.1.0 go.mongodb.org/mongo-driver v1.17.6 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.76.0 + google.golang.org/grpc v1.77.0 google.golang.org/protobuf v1.36.10 gopkg.in/yaml.v3 v3.0.1 ) require ( github.com/Microsoft/go-winio v0.6.2 // indirect - github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251117160429-c598d23eddcf // indirect + github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251119083800-2aa1d4cc79d7 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.24.4 // indirect github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect @@ -65,7 +65,7 @@ require ( github.com/nats-io/nuid v1.0.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.67.2 // indirect + github.com/prometheus/common v0.67.3 // indirect github.com/prometheus/procfs v0.19.2 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect diff --git a/api/chain/gateway/go.sum b/api/chain/gateway/go.sum index 9fdd6f2..704ef47 100644 --- a/api/chain/gateway/go.sum +++ b/api/chain/gateway/go.sum @@ -10,6 +10,8 @@ github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251110112254 github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251110112254-48a6e677648f/go.mod h1:ioLG6R+5bUSO1oeGSDxOV3FADARuMoytZCSX6MEMQkI= github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251117160429-c598d23eddcf h1:aZI2VRIP0LAI6Rw934WEAxxL0SNYSVt9vR9h/cP5Pbo= github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251117160429-c598d23eddcf/go.mod h1:ioLG6R+5bUSO1oeGSDxOV3FADARuMoytZCSX6MEMQkI= +github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251119083800-2aa1d4cc79d7 h1:uups37roJCTtR/BrJa0WoMrxt3rzgV+Qrj+TxYyJoAo= +github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251119083800-2aa1d4cc79d7/go.mod h1:ioLG6R+5bUSO1oeGSDxOV3FADARuMoytZCSX6MEMQkI= github.com/VictoriaMetrics/fastcache v1.13.0 h1:AW4mheMR5Vd9FkAPUv+NH6Nhw+fmbTMGMsNAoA/+4G0= github.com/VictoriaMetrics/fastcache v1.13.0/go.mod h1:hHXhl4DA2fTL2HTZDJFXWgW0LNjo6B+4aj2Wmng3TjU= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -247,6 +249,8 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8= github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko= +github.com/prometheus/common v0.67.3 h1:shd26MlnwTw5jksTDhC7rTQIteBxy+ZZDr3t7F2xN2Q= +github.com/prometheus/common v0.67.3/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI= github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws= github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= @@ -376,6 +380,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= +google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM= +google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/api/fx/ingestor/go.mod b/api/fx/ingestor/go.mod index 21a9959..c856265 100644 --- a/api/fx/ingestor/go.mod +++ b/api/fx/ingestor/go.mod @@ -35,7 +35,7 @@ require ( github.com/nats-io/nkeys v0.4.11 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.67.2 // indirect + github.com/prometheus/common v0.67.3 // indirect github.com/prometheus/procfs v0.19.2 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect @@ -50,6 +50,6 @@ require ( golang.org/x/sys v0.38.0 // indirect golang.org/x/text v0.31.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba // indirect - google.golang.org/grpc v1.76.0 // indirect + google.golang.org/grpc v1.77.0 // indirect google.golang.org/protobuf v1.36.10 // indirect ) diff --git a/api/fx/ingestor/go.sum b/api/fx/ingestor/go.sum index b1ed329..53148e5 100644 --- a/api/fx/ingestor/go.sum +++ b/api/fx/ingestor/go.sum @@ -119,6 +119,8 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8= github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko= +github.com/prometheus/common v0.67.3 h1:shd26MlnwTw5jksTDhC7rTQIteBxy+ZZDr3t7F2xN2Q= +github.com/prometheus/common v0.67.3/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI= github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws= github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -230,6 +232,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= +google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM= +google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/api/fx/oracle/go.mod b/api/fx/oracle/go.mod index 5b6e650..1659166 100644 --- a/api/fx/oracle/go.mod +++ b/api/fx/oracle/go.mod @@ -13,7 +13,7 @@ require ( github.com/tech/sendico/pkg v0.1.0 go.mongodb.org/mongo-driver v1.17.6 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.76.0 + google.golang.org/grpc v1.77.0 google.golang.org/protobuf v1.36.10 gopkg.in/yaml.v3 v3.0.1 ) @@ -37,7 +37,7 @@ require ( github.com/nats-io/nkeys v0.4.11 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.67.2 // indirect + github.com/prometheus/common v0.67.3 // indirect github.com/prometheus/procfs v0.19.2 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect diff --git a/api/fx/oracle/go.sum b/api/fx/oracle/go.sum index b00a4ba..13a4a5d 100644 --- a/api/fx/oracle/go.sum +++ b/api/fx/oracle/go.sum @@ -119,6 +119,8 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8= github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko= +github.com/prometheus/common v0.67.3 h1:shd26MlnwTw5jksTDhC7rTQIteBxy+ZZDr3t7F2xN2Q= +github.com/prometheus/common v0.67.3/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI= github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws= github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -218,6 +220,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= +google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM= +google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/api/ledger/go.mod b/api/ledger/go.mod index c015888..12767dd 100644 --- a/api/ledger/go.mod +++ b/api/ledger/go.mod @@ -11,7 +11,7 @@ require ( github.com/tech/sendico/pkg v0.1.0 go.mongodb.org/mongo-driver v1.17.6 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.76.0 + google.golang.org/grpc v1.77.0 google.golang.org/protobuf v1.36.10 gopkg.in/yaml.v3 v3.0.1 ) @@ -38,7 +38,7 @@ require ( github.com/nats-io/nuid v1.0.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.67.2 // indirect + github.com/prometheus/common v0.67.3 // indirect github.com/prometheus/procfs v0.19.2 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect diff --git a/api/ledger/go.sum b/api/ledger/go.sum index 7fa6056..4ae6767 100644 --- a/api/ledger/go.sum +++ b/api/ledger/go.sum @@ -119,6 +119,8 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8= github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko= +github.com/prometheus/common v0.67.3 h1:shd26MlnwTw5jksTDhC7rTQIteBxy+ZZDr3t7F2xN2Q= +github.com/prometheus/common v0.67.3/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI= github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws= github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -220,6 +222,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= +google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM= +google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/api/notification/go.mod b/api/notification/go.mod index 89a3e9f..4f18fef 100644 --- a/api/notification/go.mod +++ b/api/notification/go.mod @@ -38,7 +38,7 @@ require ( github.com/nats-io/nuid v1.0.1 // indirect github.com/prometheus/client_golang v1.23.2 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.67.2 // indirect + github.com/prometheus/common v0.67.3 // indirect github.com/prometheus/procfs v0.19.2 // indirect github.com/sendgrid/rest v2.6.9+incompatible // indirect github.com/toorop/go-dkim v0.0.0-20250226130143-9025cce95817 // indirect @@ -53,6 +53,6 @@ require ( golang.org/x/sync v0.18.0 // indirect golang.org/x/sys v0.38.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba // indirect - google.golang.org/grpc v1.76.0 // indirect + google.golang.org/grpc v1.77.0 // indirect google.golang.org/protobuf v1.36.10 // indirect ) diff --git a/api/notification/go.sum b/api/notification/go.sum index ff04c50..acaab3e 100644 --- a/api/notification/go.sum +++ b/api/notification/go.sum @@ -125,6 +125,8 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8= github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko= +github.com/prometheus/common v0.67.3 h1:shd26MlnwTw5jksTDhC7rTQIteBxy+ZZDr3t7F2xN2Q= +github.com/prometheus/common v0.67.3/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI= github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws= github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -233,6 +235,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= +google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM= +google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/api/payments/orchestrator/go.mod b/api/payments/orchestrator/go.mod index 6ac7d6d..5973b59 100644 --- a/api/payments/orchestrator/go.mod +++ b/api/payments/orchestrator/go.mod @@ -21,7 +21,7 @@ require ( github.com/tech/sendico/pkg v0.1.0 go.mongodb.org/mongo-driver v1.17.6 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.76.0 + google.golang.org/grpc v1.77.0 google.golang.org/protobuf v1.36.10 gopkg.in/yaml.v3 v3.0.1 ) @@ -46,7 +46,7 @@ require ( github.com/nats-io/nkeys v0.4.11 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.67.2 // indirect + github.com/prometheus/common v0.67.3 // indirect github.com/prometheus/procfs v0.19.2 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect diff --git a/api/payments/orchestrator/go.sum b/api/payments/orchestrator/go.sum index 0468119..4babef9 100644 --- a/api/payments/orchestrator/go.sum +++ b/api/payments/orchestrator/go.sum @@ -119,6 +119,8 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8= github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko= +github.com/prometheus/common v0.67.3 h1:shd26MlnwTw5jksTDhC7rTQIteBxy+ZZDr3t7F2xN2Q= +github.com/prometheus/common v0.67.3/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI= github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws= github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -221,6 +223,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= +google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM= +google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/api/pkg/go.mod b/api/pkg/go.mod index 0147599..e96d7fa 100644 --- a/api/pkg/go.mod +++ b/api/pkg/go.mod @@ -17,7 +17,7 @@ require ( go.mongodb.org/mongo-driver v1.17.6 go.uber.org/zap v1.27.0 golang.org/x/crypto v0.44.0 - google.golang.org/grpc v1.76.0 + google.golang.org/grpc v1.77.0 google.golang.org/protobuf v1.36.10 ) @@ -67,7 +67,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.67.2 // indirect + github.com/prometheus/common v0.67.3 // indirect github.com/prometheus/procfs v0.19.2 // indirect github.com/shirou/gopsutil/v3 v3.24.5 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect @@ -80,12 +80,12 @@ require ( github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect - go.opentelemetry.io/otel v1.37.0 // indirect + go.opentelemetry.io/otel v1.38.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect - go.opentelemetry.io/otel/metric v1.37.0 // indirect - go.opentelemetry.io/otel/trace v1.37.0 // indirect + go.opentelemetry.io/otel/metric v1.38.0 // indirect + go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect golang.org/x/net v0.47.0 // indirect diff --git a/api/pkg/go.sum b/api/pkg/go.sum index daeed6a..d3150a6 100644 --- a/api/pkg/go.sum +++ b/api/pkg/go.sum @@ -130,6 +130,8 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8= github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko= +github.com/prometheus/common v0.67.3 h1:shd26MlnwTw5jksTDhC7rTQIteBxy+ZZDr3t7F2xN2Q= +github.com/prometheus/common v0.67.3/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI= github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws= github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= @@ -174,22 +176,26 @@ go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUps go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= 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/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0/go.mod h1:qxuZLtbq5QDtdeSHsS7bcf6EH6uO6jUAgk764zd3rhM= go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ= go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I= +go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU= go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE= go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E= +go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc= go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps= go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4= go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= +go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -275,6 +281,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= +google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM= +google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/ci/scripts/common/bump_version.sh b/ci/scripts/common/bump_version.sh index a330aca..eba26d1 100755 --- a/ci/scripts/common/bump_version.sh +++ b/ci/scripts/common/bump_version.sh @@ -1,8 +1,167 @@ #!/bin/sh set -eu +log() { + printf '[bump-version] %s\n' "$*" +} + +error() { + printf '[bump-version] %s\n' "$*" >&2 +} + +die() { + error "${1:-fatal error}" + exit "${2:-1}" +} + +var_value() { + # shellcheck disable=SC2039 + eval "printf '%s' \"\${$1:-}\"" +} + +normalize_host() { + value="$1" + if [ -z "${value}" ]; then + printf '%s' "" + return + fi + printf '%s' "${value}" | sed -E ' + s#^[[:alpha:]][[:alnum:]+.-]*://##; + s#^[^@]*@##; + s#[:/].*$##; + ' +} + +extract_proto() { + url="$1" + if printf '%s' "${url}" | grep -Eq '^[[:alpha:]][[:alnum:]+.-]*://'; then + printf '%s' "${url}" | sed -E 's#^([[:alpha:]][[:alnum:]+.-]*://).*#\1#' | tr -d ':/' + return + fi + if printf '%s' "${url}" | grep -Eq '^[^@]+@[^:]+:'; then + printf 'ssh' + return + fi + printf 'https' +} + +discover_env_credentials() { + DEFAULT_GIT_USER="${GIT_AUTH_DEFAULT_USER:-woodpecker}" + while IFS=: read -r user_var pass_var; do + [ -n "${pass_var}" ] || continue + pass="$(var_value "${pass_var}")" + [ -n "${pass}" ] || continue + if [ "${user_var}" = "-" ] || [ -z "${user_var}" ]; then + user="" + else + user="$(var_value "${user_var}")" + fi + if [ -z "${user}" ]; then + user="${DEFAULT_GIT_USER}" + fi + GIT_AUTH_USER="${user}" + GIT_AUTH_PASS="${pass}" + GIT_AUTH_SOURCE="env:${user_var:--}/${pass_var}" + return 0 + done <<'EOF' +CI_GIT_USERNAME:CI_GIT_PASSWORD +CI_GIT_USERNAME:CI_GIT_TOKEN +CI_GIT_USERNAME:CI_GIT_PASS +CI_GIT_USER:CI_GIT_PASSWORD +CI_GIT_USER:CI_GIT_TOKEN +CI_NETRC_USERNAME:CI_NETRC_PASSWORD +CI_NETRC_LOGIN:CI_NETRC_PASSWORD +WOODPECKER_GIT_USERNAME:WOODPECKER_GIT_PASSWORD +WOODPECKER_GIT_USERNAME:WOODPECKER_GIT_TOKEN +WOODPECKER_NETRC_USERNAME:WOODPECKER_NETRC_PASSWORD +WOODPECKER_NETRC_LOGIN:WOODPECKER_NETRC_PASSWORD +DRONE_GIT_USERNAME:DRONE_GIT_PASSWORD +DRONE_GIT_USERNAME:DRONE_GIT_TOKEN +DRONE_NETRC_USERNAME:DRONE_NETRC_PASSWORD +DRONE_NETRC_LOGIN:DRONE_NETRC_PASSWORD +GIT_USERNAME:GIT_PASSWORD +GIT_USER:GIT_PASS +GIT_AUTH_USERNAME:GIT_AUTH_PASSWORD +-:GIT_PASSWORD +-:GIT_PASS +EOF + + for token_var in CI_GIT_TOKEN WOODPECKER_GIT_TOKEN DRONE_GIT_TOKEN GIT_TOKEN GITEA_TOKEN; do + token="$(var_value "${token_var}")" + if [ -n "${token}" ]; then + user="$(var_value CI_GIT_USERNAME)" + [ -n "${user}" ] || user="$(var_value WOODPECKER_GIT_USERNAME)" + [ -n "${user}" ] || user="$(var_value DRONE_GIT_USERNAME)" + [ -n "${user}" ] || user="${DEFAULT_GIT_USER}" + GIT_AUTH_USER="${user}" + GIT_AUTH_PASS="${token}" + GIT_AUTH_SOURCE="env:${token_var}" + return 0 + fi + done + return 1 +} + +discover_vault_credentials() { + VAULT_MOUNT="${GIT_CREDENTIALS_VAULT_MOUNT:-kv}" + VAULT_PATH="${GIT_CREDENTIALS_VAULT_PATH:-${CI_GIT_VAULT_PATH:-}}" + [ -n "${VAULT_PATH}" ] || return 1 + VLT_BIN="${GIT_VAULT_HELPER:-./ci/vlt}" + if [ ! -x "${VLT_BIN}" ]; then + return 1 + fi + user_field="${GIT_CREDENTIALS_VAULT_USER_FIELD:-username}" + pass_field="${GIT_CREDENTIALS_VAULT_PASSWORD_FIELD:-password}" + if ! GIT_AUTH_USER="$("${VLT_BIN}" kv_get "${VAULT_MOUNT}" "${VAULT_PATH}" "${user_field}" 2>/dev/null)"; then + return 1 + fi + if ! GIT_AUTH_PASS="$("${VLT_BIN}" kv_get "${VAULT_MOUNT}" "${VAULT_PATH}" "${pass_field}" 2>/dev/null)"; then + return 1 + fi + GIT_AUTH_SOURCE="vault:${VAULT_MOUNT}/${VAULT_PATH}" + return 0 +} + +write_netrc() { + host="$1" + user="$2" + pass="$3" + file="${HOME:-/root}/.netrc" + { + printf 'machine %s\n' "${host}" + printf 'login %s\n' "${user}" + printf 'password %s\n' "${pass}" + } > "${file}" + chmod 600 "${file}" +} + +setup_https_credentials() { + host="$1" + netrc="${HOME:-/root}/.netrc" + if [ -s "${netrc}" ] && awk -v host="${host}" ' + $1 == "machine" && $2 == host { found=1; exit } + END { exit found ? 0 : 1 } + ' "${netrc}"; then + log "reusing credentials already present in ${netrc}" + return 0 + fi + if discover_env_credentials; then + masked="$(printf '%s' "${GIT_AUTH_USER}" | cut -c1-2)***" + log "using ${GIT_AUTH_SOURCE} for ${host} (user ${masked})" + write_netrc "${host}" "${GIT_AUTH_USER}" "${GIT_AUTH_PASS}" + return 0 + fi + if discover_vault_credentials; then + masked="$(printf '%s' "${GIT_AUTH_USER}" | cut -c1-2)***" + log "using ${GIT_AUTH_SOURCE} for ${host} (user ${masked})" + write_netrc "${host}" "${GIT_AUTH_USER}" "${GIT_AUTH_PASS}" + return 0 + fi + return 1 +} + START_DIR="$(pwd)" -echo "[bump-version] invoked from ${START_DIR}" +log "invoked from ${START_DIR}" SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" REPO_ROOT="" @@ -12,17 +171,16 @@ fi if [ -z "${REPO_ROOT}" ]; then REPO_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)" fi -echo "[bump-version] repo root resolved to ${REPO_ROOT}" +log "repo root resolved to ${REPO_ROOT}" cd "${REPO_ROOT}" VERSION_FILE="./version" if [ ! -f "${VERSION_FILE}" ]; then if git cat-file -e "HEAD:version" 2>/dev/null; then - echo "[bump-version] version file missing in workspace, restoring from HEAD" >&2 + error "version file missing in workspace, restoring from HEAD" git show "HEAD:version" > "${VERSION_FILE}" else - echo "[bump-version] version file not found: ${VERSION_FILE}" >&2 - exit 1 + die "version file not found: ${VERSION_FILE}" fi fi @@ -47,11 +205,11 @@ NEXT_VERSION="$(printf '%s' "${CURRENT_VERSION}" | awk -F. -v OFS=. ' }')" printf '%s\n' "${NEXT_VERSION}" > "${VERSION_FILE}" -echo "[bump-version] ${CURRENT_VERSION} -> ${NEXT_VERSION}" +log "${CURRENT_VERSION} -> ${NEXT_VERSION}" git add "${VERSION_FILE}" if git diff --cached --quiet; then - echo "[bump-version] no changes staged, skipping commit" + log "no changes staged, skipping commit" exit 0 fi @@ -71,47 +229,36 @@ REMOTE_URL="${CI_REPO_REMOTE:-${WOODPECKER_GIT_REMOTE:-${DRONE_REMOTE_URL:-}}}" if [ -z "${REMOTE_URL}" ]; then REMOTE_URL="$(git config --get remote.origin.url 2>/dev/null || true)" fi +[ -n "${REMOTE_URL}" ] || die "unable to determine git remote url" -# Normalize machine to a bare hostname so .netrc matches HTTPS requests. -normalize_machine() { - value="$1" - if [ -z "${value}" ]; then - printf '%s' "" - return - fi - printf '%s' "${value}" | sed -E ' - s#^[[:alpha:]][[:alnum:]+.-]*://##; - s#^[^@]*@##; - s#/.*$##; - s#:[0-9]+$##; - ' -} +REMOTE_PROTO="$(extract_proto "${REMOTE_URL}")" +REMOTE_HOST="$(normalize_host "${REMOTE_URL}")" +[ -n "${REMOTE_HOST}" ] || die "unable to determine remote host from ${REMOTE_URL}" -NETRC_MACHINE="${CI_NETRC_MACHINE:-${WOODPECKER_NETRC_MACHINE:-${DRONE_NETRC_MACHINE:-}}}" -NETRC_USERNAME="${CI_NETRC_USERNAME:-${WOODPECKER_NETRC_USERNAME:-${DRONE_NETRC_USERNAME:-${CI_NETRC_LOGIN:-${WOODPECKER_NETRC_LOGIN:-${DRONE_NETRC_LOGIN:-}}}}}}" -NETRC_PASSWORD="${CI_NETRC_PASSWORD:-${WOODPECKER_NETRC_PASSWORD:-${DRONE_NETRC_PASSWORD:-}}}" -NETRC_MACHINE="$(normalize_machine "${NETRC_MACHINE}")" -if [ -z "${NETRC_MACHINE}" ] && [ -n "${REMOTE_URL}" ]; then - NETRC_MACHINE="$(normalize_machine "${REMOTE_URL}")" -fi +log "using remote ${REMOTE_URL}" +git remote set-url origin "${REMOTE_URL}" -if [ -n "${NETRC_MACHINE}" ] && [ -n "${NETRC_USERNAME}" ] && [ -n "${NETRC_PASSWORD}" ]; then - MASKED_USER="$(printf '%s' "${NETRC_USERNAME}" | cut -c1-2)***" - echo "[bump-version] configuring credentials for ${NETRC_MACHINE} (user ${MASKED_USER})" - NETRC_FILE="${HOME:-/root}/.netrc" - { - printf 'machine %s\n' "${NETRC_MACHINE}" - printf 'login %s\n' "${NETRC_USERNAME}" - printf 'password %s\n' "${NETRC_PASSWORD}" - } > "${NETRC_FILE}" - chmod 600 "${NETRC_FILE}" -else - echo "[bump-version] no netrc credentials available" -fi - -if [ -n "${REMOTE_URL}" ]; then - echo "[bump-version] using remote ${REMOTE_URL}" - git remote set-url origin "${REMOTE_URL}" -fi +case "${REMOTE_PROTO}" in + ssh) + if [ -n "${GIT_SSH_KEY_B64:-}" ]; then + SSH_KEY_FILE="${HOME:-/root}/.ssh/id_ci" + mkdir -p "$(dirname "${SSH_KEY_FILE}")" + printf '%s' "${GIT_SSH_KEY_B64}" | base64 -d > "${SSH_KEY_FILE}" + chmod 600 "${SSH_KEY_FILE}" + export GIT_SSH_COMMAND="ssh -i ${SSH_KEY_FILE} -o StrictHostKeyChecking=no" + log "configured SSH key for git push" + else + log "no SSH key provided, relying on existing agent configuration" + fi + ;; + http|https) + if ! setup_https_credentials "${REMOTE_HOST}"; then + die "no git credentials detected (set CI_GIT_USERNAME/CI_GIT_PASSWORD, WOODPECKER_GIT_USERNAME/WOODPECKER_GIT_PASSWORD, or configure GIT_CREDENTIALS_VAULT_PATH)" + fi + ;; + *) + log "unknown git protocol ${REMOTE_PROTO}, attempting push without extra credentials" + ;; +esac git push origin "HEAD:${BRANCH}" diff --git a/frontend/.DS_Store b/frontend/.DS_Store deleted file mode 100644 index 5f303ac654ba7a4dd59af0b734ea6d0542dae5f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMTWl0n7(U;$&>1?=0a{tG1Dh^Hz!qu&yWEoPO}Q7@mTt>s+1(lGz;veU%x;UN zW@F+Dh{h+4x5$&X$b*U!Uo=q^eN;5T7#}bi^+gkWQF-v6IkV6UBt96UI47C&pZ|8w z{QrFanLV?NF|-%7dl-u_#zeY2s#H^VljiBYYg!WmNhMK`Kg*6d!&%eL5`TW0btnik z5N06EK$w9r17QaK4H=+!w%5d4y!W{_?86L%8Temjz}p|9ba^xp&=RNq)$$+Vzqc6IcSe0-Hcms z+B5lm9@k^rX0|-eWcM2SNLs1wuq`)ZSbE-fFf^S^_V*c z$kN?JU32gFxFpuaR&U&sK57nG_DLQBf^C4!o)XfjiSd|D zv4ek)s7RLM`Kla`G^<*kt@fq*2lmNnWnPhPynEO+Y|GiJ=N+PHrN*HEx8`hXcV74O zeL34K3|UTEnVZX)xq_K-^)}N?8V~6tt8sF9+cbCEj^RzypK|q4*V9c?r3M^3?{@f; zr3{*%TPX!c-=ou{Mp5sish!#>!9hAZXTg%C%bQwSHzm5Z?tI` z@t~pS`!h~Xw=}~#+&f}u?qFZhaEz>}_gI-BU7CwV=~7K(;i5b1Rh1jua44Im3R&Y= z!Elc&F;Vo_h^h_pevR&Fr>%LbXrgkC=AqS>sSWBrPt%dtsn-IB73$q`k3+$WN`@P* zlAGn8qXYp-akylSyiV;kGg;k~6pgPFmp7<=MV^02+0KQVe39?_LY>4T@9+*?@iaH zX?_fgA`5HOq}nSgpNVNjF|49Nu&2k$(J#izk0zE_$%nD`b0vS|CpwmB=3coXOFHr~TUe1cE$Ij-Pae24Gx zGk(V(xF*aH76=hxq0k^S3QfW)p;d?r8-$I*E}>gU2^rytU<;!>0HIuJ2RL8uh2u23 zzI9Nk1)u(evo|lb`un$R-M0O|Q)-vz_{CLQcgKS0vX!gX#y7WJ2O&po8K@KC?_+*a zrTCclF);!ab!@3f#iGmz*ySsT-LA~!Y<<%z zkqT20d{(Y+StC*TDHQ?R)JiNkBX8U!Q6Vao0lPRsEc2QA`pzzz=At70T`0fIuCO22 zFYFqjd=BO#g1gX6*lx!b?DEl_L@y2^jYG&n!w@XkI7T=>fpI*H5*{IxKSnrz0#D)@ zJd5WD>o4JDyn@&8IwAcXoX5NP03YH4J`OPdH6i{dT%CgAon`!TieD$9xR}garfnT2 zSsC?{&2KBNf=3ha&i`Gv{{DYk#T*6`W+2SKwg&1I7+6TPa>ctPDw)TAO8^G{~-ShKefa6fB63Q5qf)ee*y^?Y7YPa diff --git a/frontend/pshared/lib/api/requests/.DS_Store b/frontend/pshared/lib/api/requests/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0J5S@WYtb~M8Qu+pv8<=Q0K`s!INKhnfilpDufke+)DB(TN1hI+>8W2J= zk^RP=kG)Td?GX{3?pG6$v4}KiM5R&@PFGDQ?mPl&$+4G5*{$y1KB#Pc8xS4!9Xw&3hM3JDbv+8%7@t1OvgqCj&em5*jf(_J-x?KvzltAfM4iptF`>OmfVQy&)_RwNRji zs+SmQ;h0bEmmPaU3m5g`Lw)5#@uFpQF|hyu diff --git a/frontend/pshared/lib/models/storable/.DS_Store b/frontend/pshared/lib/models/storable/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0=3.9.0 <4.0.0" - flutter: ">=3.35.1"