From 2d3d2d9bfeae9f50e47925c83119e1cf76eae148 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 12 Oct 2022 11:10:38 +0200 Subject: [PATCH] Must PR for main --- .github/workflows/flathub_push_main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml index ccd8e2f3..9fdf63b7 100644 --- a/.github/workflows/flathub_push_main.yml +++ b/.github/workflows/flathub_push_main.yml @@ -28,6 +28,8 @@ jobs: git clone --recursive https://github.com/XargonWan/RetroDECK RetroDECK cd $gits_folder/RetroDECK + relname="main-"$(git rev-parse --short HEAD) + git checkout $rd_branch git submodule init git submodule update @@ -37,7 +39,7 @@ jobs: cd $gits_folder/flathub - git checkout master + git checkout -b $relname git rm -rf * git clean -fxd # restroing git index @@ -81,4 +83,4 @@ jobs: git commit -m "Updated flathub/net.retrodeck.retrodeck from RetroDECK/$rd_branch" git remote -v - git push https://${{ secrets.TRIGGER_BUILD_TOKEN }}@github.com/flathub/net.retrodeck.retrodeck.git master + git push https://${{ secrets.TRIGGER_BUILD_TOKEN }}@github.com/flathub/net.retrodeck.retrodeck.git $relname