From cbf6a79f8e55bff84a735f1d99a54707f2b79e1d Mon Sep 17 00:00:00 2001 From: Skydust Date: Sat, 28 Dec 2024 14:18:29 +0100 Subject: [PATCH] Fast-forwarded to origin/dev --- action.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index 5bc1646..1212b8b 100644 --- a/action.yml +++ b/action.yml @@ -70,10 +70,14 @@ runs: log_info "Pushing new tag" git fetch git tag -a "v${NEW_VERSION}" -m "Release version ${NEW_VERSION}" - git push origin "v${NEW_VERSION}" + #git push origin "v${NEW_VERSION}" - name: Fast forwarding master branch to dev run: | log_info "Fast-forwarding master to dev" git checkout master - git merge --ff-only dev + git fetch --depth=0 origin dev + git rev-list master + log_info "dev" + git rev-list origin/dev + git merge --ff-only origin/dev git push