diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index beef6c5..8b13789 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,25 +1 @@ -name: 레포지토리 최신화 -on: - workflow_dispatch: - schedule: - - cron: "0 8 * * *" #Runs at 8:00 UTC(5:00 in Korea) every day. -jobs: - merge: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Merge upstream - run: | - git config --global user.name 'kanguk01' - git config --global user.email 'lm0828@naver.com' - # "git checkout master" is unnecessary, already here by default - git pull --unshallow # this option is very important, you would get - # complains about unrelated histories without it. - # (but actions/checkout@v2 can also be instructed - # to fetch all git depth right from the start) - git remote add upstream https://github.com/kakao-tech-campus-2nd-step3/Team3_FE.git - git fetch upstream - git checkout master - git merge -Xtheirs upstream/master - git push origin master