From a54ab12f117fdb62e4d54e4160836a0de82ffc9c Mon Sep 17 00:00:00 2001 From: Skydust Date: Fri, 27 Dec 2024 00:02:31 +0100 Subject: [PATCH] Added ff master and prevented other branches getting a release --- action.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 3faf4cd..b1bab09 100644 --- a/action.yml +++ b/action.yml @@ -18,7 +18,14 @@ inputs: runs: using: composite steps: - - uses: actions/checkout@v4 + - name: Checkout repo + uses: actions/checkout@v4 + - name: Checking if ran on the dev branch + run: | + if [[ "${{ github.ref }}" != refs/tags/dev ]]; then + log_info $(red)ERROR$(reset_color) This can only be ran on the dev branch + exit 1 + fi - name: Get new version run: | last_version="$(git -c 'versionsort.suffix=-' ls-remote --tags -q --refs --sort '-v:refname' | head -n 1 | cut -d "/" -f3 || echo "")" @@ -63,3 +70,9 @@ runs: git fetch git tag -a "v${NEW_VERSION}" -m "Release version ${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 origin/dev + git push --force-with-lease