diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml deleted file mode 100644 index 89099da7..00000000 --- a/.github/workflows/merge-upstream.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Merge-upstream - -on: - push: - branches: - - master - schedule: - - cron: 20 19 * * * - -jobs: - merge: - - runs-on: ubuntu-latest - - steps: - - - name: Checkout - uses: actions/checkout@master - with: - ref: master - fetch-depth: 0 - lfs: true - - - name: Set git identity - run : | - git config --global user.email "tofuliang@gmail.com" - git config --global user.name "tofuliang" - - name: Load upstream commits - run: git pull https://github.com/coolsnowwolf/packages.git --no-edit --strategy-option ours - - - name: Push Commits - env: - DOWNSTREAM_BRANCH: master - run: git push origin $DOWNSTREAM_BRANCH