This is an automated email from the ASF dual-hosted git repository. sciabarracom pushed a commit to branch 0.9.0 in repository https://gitbox.apache.org/repos/asf/openserverless.git
commit a76adf909be417d82b35cc7d6b9966576f2701d9 Author: Michele Sciabarra <[email protected]> AuthorDate: Thu Oct 22 13:27:21 2026 +0100 sync again --- Taskfile.yml | 14 ++++++++++++++ admin-api | 2 +- devcontainer | 2 +- oplugins | 2 +- streamer | 2 +- testing | 2 +- 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index b6f0a04..4a2b9b3 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -343,6 +343,20 @@ tasks: cmds: - python3 syncimages.py --write={{.WRITE}} "{{.GHUSER}}" + align-main: + requires: {vars: [SUB]} + desc: create pr to merge in main for SUB=<subrepo> + cmds: + - | + SUB={{.SUB}} + BRANCH=0.9.0 + cd $SUB + git fetch --all + git merge -s ours main + git push origin $BRANCH + gh pr create --base main --head $BRANCH --title "Use Merge NOT Squash!" --body "Align main with $BRANCH" + + targz: requires: {vars: [FILE]} cmds: diff --git a/admin-api b/admin-api index 26269bc..17fdcef 160000 --- a/admin-api +++ b/admin-api @@ -1 +1 @@ -Subproject commit 26269bc19cd5a5b5e1a3149c4f9ef0f07b10e1ca +Subproject commit 17fdcef632b054fd759223f5d71abe39eb9bb649 diff --git a/devcontainer b/devcontainer index c639db1..c453ff0 160000 --- a/devcontainer +++ b/devcontainer @@ -1 +1 @@ -Subproject commit c639db115dfddf5e660841eaf520beea541047d3 +Subproject commit c453ff0e65cf06a4458f7fa6ae09ca69ff78f843 diff --git a/oplugins b/oplugins index 99483d3..0b3718b 160000 --- a/oplugins +++ b/oplugins @@ -1 +1 @@ -Subproject commit 99483d3b9819a4110bebdc462715a5a4c32da3ad +Subproject commit 0b3718b857cb675f58acbc4c53d78db50ee89b5c diff --git a/streamer b/streamer index 2de9299..f206907 160000 --- a/streamer +++ b/streamer @@ -1 +1 @@ -Subproject commit 2de92993ff4930715eec38ae80ed91b9ded15c21 +Subproject commit f20690736f35851373217f084628075447fbafde diff --git a/testing b/testing index a41a532..4a4460b 160000 --- a/testing +++ b/testing @@ -1 +1 @@ -Subproject commit a41a5325936da67035f54c08a917104d7448e3a2 +Subproject commit 4a4460b36db67aa763ab06e874dbd36d95bfd3d0
