Fast-forwarded to origin/dev

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

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
@@ -70,10 +72,14 @@ runs:
log_info "Pushing new tag" log_info "Pushing new tag"
git fetch git fetch
git tag -a "v${NEW_VERSION}" -m "Release version ${NEW_VERSION}" 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 - name: Fast forwarding master branch to dev
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 fetch origin dev
git rev-list master
log_info "dev"
git rev-list origin/dev
git merge --ff-only origin/dev
git push git push