Skip to content

Commit

Permalink
chore: ignore ci wf
Browse files Browse the repository at this point in the history
  • Loading branch information
lcaohoanq committed Sep 19, 2024
1 parent 3a548e4 commit c1bf679
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions .github/workflows/merge-develop-to-master.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
name: Merge develop to master

on:
push:
branches:
- develop

jobs:
merge:
runs-on: ubuntu-latest

steps:
- name: Checkout develop branch
uses: actions/checkout@v3
with:
ref: develop

- name: Setup Git
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
- name: Checkout master branch
run: git checkout origin/master

- name: Merge develop into master
run: |
git merge develop
git push origin master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
#name: Merge develop to master
#
#on:
# push:
# branches:
# - develop
#
#jobs:
# merge:
# runs-on: ubuntu-latest
#
# steps:
# - name: Checkout develop branch
# uses: actions/checkout@v3
# with:
# ref: develop
#
# - name: Setup Git
# run: |
# git config --global user.name 'github-actions[bot]'
# git config --global user.email 'github-actions[bot]@users.noreply.github.com'
#
# - name: Checkout master branch
# run: git checkout origin/master
#
# - name: Merge develop into master
# run: |
# git merge develop
# git push origin master
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit c1bf679

Please sign in to comment.