Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xTire/kernel-source
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: md-work/kernel-source
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 10 commits
  • 1 file changed
  • 1 contributor

Commits on Feb 14, 2022

  1. Add a workflow for pulling from SUSE repo

    @xTire
    xTire authored Feb 14, 2022
    Copy the full SHA
    18fdb1d View commit details

  2. Update auto_sync_from_upstream.yml

    @xTire
    xTire authored Feb 14, 2022
    Copy the full SHA
    fb3b3eb View commit details

  3. Update and rename auto_sync_from_upstream.yml to auto_sync_to_upstrea… 

    …m.yml
    @xTire
    xTire authored Feb 14, 2022
    Copy the full SHA
    2713852 View commit details

  4. Update auto_sync_to_upstream.yml

    @xTire
    xTire authored Feb 14, 2022
    Copy the full SHA
    2758e7d View commit details

  5. Update auto_sync_to_upstream.yml

    @xTire
    xTire authored Feb 14, 2022
    Copy the full SHA
    b2606b0 View commit details

  6. Delete auto_sync_to_upstream.yml

    @xTire
    xTire authored Feb 14, 2022
    Copy the full SHA
    44bc877 View commit details

  7. Merge branch 'SUSE:master' into master

    @xTire
    xTire authored Feb 14, 2022
    Copy the full SHA
    3390f74 View commit details

Commits on Feb 16, 2022

  1. Create main.yml

    @xTire
    xTire authored Feb 16, 2022
    Copy the full SHA
    acec725 View commit details

  2. Rename main.yml to auto_merge_upstream_master.yml

    @xTire
    xTire authored Feb 16, 2022
    Copy the full SHA
    2837506 View commit details

  3. Update auto_merge_upstream_master.yml

    @xTire
    xTire authored Feb 16, 2022
    Copy the full SHA
    18d2924 View commit details
Showing with 34 additions and 0 deletions.
  1. +34 −0 .github/workflows/auto_merge_upstream_master.yml
34 changes: 34 additions & 0 deletions .github/workflows/auto_merge_upstream_master.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Merge upstream branches
on:
#schedule:
# actually, ~5 minutes is the highest
# effective frequency you will get
#- cron: '* 6 * * *'
jobs:
merge:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Merge upstream
run: |
git config --global user.name 'Jie Sheng'
git config --global user.email 'jie.sheng@suse.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/suse/kernel-source.git
git fetch upstream
# Neither forget the -b opt,
# the feature/x ref is ambiguous at this stage
#git checkout -b mymaster origin/master
#git merge --no-edit upstream/feature/x
#git push origin feature/x
git checkout master
git merge --no-edit upstream/master
git push origin master