From e1a443ed735b84b5e2b86594973673b8f0b1229e Mon Sep 17 00:00:00 2001 From: Han Date: Wed, 16 Dec 2020 13:45:14 +0800 Subject: [PATCH 1/3] Create sync-main.yml --- .github/workflows/sync-main.yml | 43 +++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/sync-main.yml diff --git a/.github/workflows/sync-main.yml b/.github/workflows/sync-main.yml new file mode 100644 index 0000000000000..360a1d1c70b07 --- /dev/null +++ b/.github/workflows/sync-main.yml @@ -0,0 +1,43 @@ +name: automatic sync main branch from llvm-project to llvm + +on: + schedule: + - cron: '*/10 * * * *' +jobs: + sync-main: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + path: src + - name: Sync + env: + BRANCH: main + SYNC_REPO: https://github.com/llvm/llvm-project + run: | + cd $GITHUB_WORKSPACE/src + branch_exist=`git ls-remote --heads origin $BRANCH | wc -l` + if [ $branch_exist -ne 0 ]; then + git checkout $BRANCH + git pull --ff --ff-only $SYNC_REPO $BRANCH + if [ $? -ne 0 ]; then + echo "failed to pull from $SYNC_REPO $BRANCH, abort" + exit 1 + fi + git_status=`git rev-list --count --left-right origin/$BRANCH...$BRANCH` + if [ "0 0" == "$git_status" ] ; then + echo "no change, skip" + elif [[ "$git_status" = 0* ]] ; then + git push origin + else + echo "$BRANCH branch invalid state" + exit 1 + fi + else + git remote add upstream $SYNC_REPO + git fetch upstream + git checkout -B $BRANCH upstream/$BRANCH + git push origin + fi + echo "sync finished" From 07915ab50c0565378b3e1477d2314c5a104383e2 Mon Sep 17 00:00:00 2001 From: Han Date: Thu, 17 Dec 2020 09:15:25 +0800 Subject: [PATCH 2/3] Update sync-main.yml --- .github/workflows/sync-main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/sync-main.yml b/.github/workflows/sync-main.yml index 360a1d1c70b07..b7c1331d0c6c9 100644 --- a/.github/workflows/sync-main.yml +++ b/.github/workflows/sync-main.yml @@ -9,6 +9,10 @@ jobs: steps: - uses: actions/checkout@v2 with: + # persist-credentials: false allows us to use our own credentials for + # pushing to the repository. Otherwise, the default github actions token + # is used. + persist-credentials: false fetch-depth: 0 path: src - name: Sync From c295ea72ca6ba0a817c13147ff25c1a5550d4660 Mon Sep 17 00:00:00 2001 From: Buildbot for SYCL Date: Thu, 17 Dec 2020 15:02:20 +0800 Subject: [PATCH 3/3] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 68cb9cd1deefc..31b46298c6a87 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,9 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details. ## DPC++ extensions + + + DPC++ is an open, cross-architecture language built upon the ISO C++ and Khronos SYCL\* standards. DPC++ extends these standards with a number of extensions, which can be found in [sycl/doc/extensions](sycl/doc/extensions) directory.