Fast-forwarded to origin/dev

This commit is contained in:
2024-12-28 14:18:29 +01:00
parent 8f6c4ec147
commit 2637d853ab

View File

@@ -20,6 +20,8 @@ runs:
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: Checking if ran on the dev branch - name: Checking if ran on the dev branch
run: | run: |
if [[ "${{ github.ref }}" != refs/heads/dev ]]; then if [[ "${{ github.ref }}" != refs/heads/dev ]]; then
@@ -75,5 +77,5 @@ runs:
run: | run: |
log_info "Fast-forwarding master to dev" log_info "Fast-forwarding master to dev"
git checkout master git checkout master
git merge --ff-only dev git merge --ff-only origin/dev
git push git push