From d08da6238d2db4cce5cc2b18945975c4700389fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Mon, 20 Mar 2023 17:15:23 +0100 Subject: [PATCH 1/3] Bump icewind/streams to 0.7.7 in master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index 95330ecbe44f8..c074e11541c6e 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 95330ecbe44f864edd0d193f249ca2acc84d9d06 +Subproject commit c074e11541c6ee3f3440d6243fff898fdb098a6f From 16f2987b434a79cd7019849c6d53f4db3616f4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Mon, 27 Mar 2023 15:51:04 +0200 Subject: [PATCH 2/3] Fix update-3rdparty command target branch computation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- .github/workflows/command-pull-3rdparty.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/command-pull-3rdparty.yml b/.github/workflows/command-pull-3rdparty.yml index 44223c4770457..83232e22c673a 100644 --- a/.github/workflows/command-pull-3rdparty.yml +++ b/.github/workflows/command-pull-3rdparty.yml @@ -37,12 +37,12 @@ jobs: git config --local user.name "nextcloud-command" - name: Pull 3rdparty - run: git submodule foreach 'if [ "$sm_path" == "3rdparty" ]; then git pull origin ${{ github.event.pull_request.base.ref }}; fi' + run: git submodule foreach 'if [ "$sm_path" == "3rdparty" ]; then git pull origin ${{ github.event.issue.pull_request.base.ref }}; fi' - name: Commit and push changes run: | git add 3rdparty - git commit -s -m "Update submodule 3rdparty to latest ${{ github.event.pull_request.base.ref }}" + git commit -s -m "Update submodule 3rdparty to latest ${{ github.event.issue.pull_request.base.ref }}" git push - name: Add reaction on failure From adb885755a9fc87a6c1aa4c5e43cf6130d560011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Mon, 27 Mar 2023 15:52:21 +0200 Subject: [PATCH 3/3] Update 3rdparty to merge commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index c074e11541c6e..61a25781426c0 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit c074e11541c6ee3f3440d6243fff898fdb098a6f +Subproject commit 61a25781426c010588c4758da451fbded2e08465