From 61a17ca5f63f4c5767509695eb01e508221d03a8 Mon Sep 17 00:00:00 2001 From: Efra Espada Date: Mon, 2 Dec 2024 11:45:27 +0100 Subject: [PATCH] feature-32-align-develop-branch-after-updating-files-in-master: added fetch-depth to checkout step --- .github/workflows/prepare_release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml index becdc1271..a98d7ee15 100644 --- a/.github/workflows/prepare_release.yml +++ b/.github/workflows/prepare_release.yml @@ -12,6 +12,8 @@ jobs: runs-on: [ self-hosted, Linux ] steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Switch to SSH run: git remote set-url origin git@gitboardflow.github.com:landamessenger/git-board-flow.git @@ -59,9 +61,15 @@ jobs: - name: Fetch all branches run: git fetch --all + - name: Pull master + run: git pull origin master + - name: Checkout develop branch run: git checkout develop + - name: Pull develop + run: git pull origin develop + - name: Merge master into develop run: git pull origin master --no-ff