Skip to content

Commit

Permalink
energia positiva
Browse files Browse the repository at this point in the history
  • Loading branch information
peregrinno committed Oct 19, 2024
1 parent 5f54926 commit 96a12ff
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/daily-random-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,18 @@ jobs:
echo "Branches encontradas: $BRANCHES"
echo "BRANCHES=\"$BRANCHES\"" >> $GITHUB_ENV
- name: Merge branches into main
- name: Merge branches into chaos
env:
GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
run: |
git checkout main
git pull origin main
git checkout chaos
git pull origin chaos
# Itera sobre as branches e faz merge de cada uma
for BRANCH in $(echo $BRANCHES); do
echo "Fazendo merge da branch $BRANCH para main"
echo "Fazendo merge da branch $BRANCH para chaos"
git merge --no-ff "$BRANCH" || echo "Falha ao fazer merge da branch $BRANCH"
done
# Push após o merge
git push origin main
git push origin chaos

0 comments on commit 96a12ff

Please sign in to comment.