Skip to content

[CI] Automatically merge HEAD of sycl branch into jobs #5281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 5, 2022
Merged

[CI] Automatically merge HEAD of sycl branch into jobs #5281

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fa578b4
[CI] Automatically merge HEAD of sycl branch into jobs
Jan 11, 2022
7b2db90
load more commits as needed
Jan 11, 2022
dd3ea52
fix syntax
Jan 11, 2022
27fd06d
Merge remote-tracking branch 'upstream/sycl' into automerge_pr
Feb 3, 2022
7a5e344
use full history
Feb 3, 2022
590dccc
origin?
Feb 3, 2022
cc0283b
revert test changes
Feb 3, 2022
d73c56f
test new scheme
Feb 4, 2022
f2a00a0
identity
Feb 4, 2022
7d82ecc
revert test changes
Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion devops/actions/cached_checkout/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ inputs:
default: 1
cache_path:
description: 'Path to cache location for all repos'
default_branch:
description: 'Name of the default branch'
default: 'sycl'

runs:
using: 'composite'
Expand All @@ -36,4 +39,16 @@ runs:
repository: ${{ inputs.repository }}
ref: ${{ inputs.ref }}
path: ${{ inputs.path }}
fetch-depth: ${{ inputs.fetch-depth }}
fetch-depth: 0
- name: Merge sycl HEAD into current branch
shell: bash
env:
GIT_ALTERNATE_OBJECT_DIRECTORIES: ${{ inputs.cache_path }}/${{ inputs.repository }}/.git/objects
DEFAULT_BRANCH: ${{ inputs.default_branch }}
run: |
cd ${{ inputs.path }}
git fetch origin $DEFAULT_BRANCH
# Set fake identity to fulfil git requirements
git config --local user.email "[email protected]"
git config --local user.name "GitHub Actions"
git merge --no-ff --no-commit origin/$DEFAULT_BRANCH