35 lines
845 B
YAML
35 lines
845 B
YAML
name: Auto-Merge Dev
|
|
run-name: Merging changes from dev
|
|
|
|
on:
|
|
pull_request:
|
|
types: [opened, synchronize, reopened]
|
|
branches: ["feature/*"]
|
|
push:
|
|
branches: ["feature/*"]
|
|
workflow_dispatch:
|
|
inputs:
|
|
branch:
|
|
description: "Branch to merge from dev"
|
|
required: true
|
|
default: "feature/example"
|
|
|
|
jobs:
|
|
auto-merge-dev:
|
|
runs-on: windows # Ejecutar directamente en el host Windows
|
|
steps:
|
|
- name: Checkout code
|
|
uses: actions/checkout@v2
|
|
|
|
- name: Merge changes from dev
|
|
run: |
|
|
git fetch origin
|
|
git checkout $GITHUB_REF # la rama feature/*
|
|
git merge origin/dev
|
|
if [ $? -eq 0 ]; then
|
|
git push origin $GITHUB_REF
|
|
else
|
|
echo "Merge conflict detected, please resolve."
|
|
exit 1
|
|
fi
|