Skip to content

Commit d5310ca

Browse files
committedAug 26, 2020
Change default branch from master to default
1 parent f26b4ce commit d5310ca

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed
 

‎.github/workflows/repo-sync.yml

+19-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ name: Repo Sync
33
on:
44
push:
55
branches:
6-
- master
6+
- default
77
paths:
88
- .github/workflows/**
99
schedule:
1010
- cron: '0 4 * * *'
1111

1212
jobs:
13-
mandrel-master:
13+
graal-master:
14+
name: Keep graal/master in sync with upstream master
1415
runs-on: ubuntu-latest
1516
steps:
1617
- name: Checkout graal/master branch
@@ -26,3 +27,19 @@ jobs:
2627
git fetch upstream master
2728
git merge --ff-only upstream/master
2829
git push --quiet origin graal/master
30+
mandrel-master:
31+
name: Keep master in sync with default
32+
runs-on: ubuntu-latest
33+
steps:
34+
- name: Checkout graal/master branch
35+
uses: actions/checkout@v2
36+
with:
37+
ref: master
38+
fetch-depth: 0
39+
- name: Sync branch
40+
run: |
41+
git config --local user.email "fzakkak@redhat.com"
42+
git config --local user.name "Foivos Zakkak through GH action"
43+
git fetch origin default
44+
git merge --ff-only origin/default
45+
git push --quiet origin master

‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ To contribute please fork this repository and open a pull request (PR).
1616

1717
## Repository Structure
1818

19-
Mandrel, being a downstream distribution of GraalVM CE, is not developed on the master branch.
19+
Mandrel, being a downstream distribution of GraalVM CE, is not developed on the `default` branch.
2020
Instead version specific branches, based on the corresponding GraalVM CE release, are used for development and maintenance.
2121
For instance, Mandrel 20.1.x.x releases are developed in the `mandrel/20.1` branch.
2222
Similarly, Mandrel 20.2.x.x releases are developed in the `mandrel/20.2` branch and so on.
2323

24-
The `master` branch is used only as a landing page and for hosting some housekeeping github actions workflows and templates.
24+
The `default` branch is used only as a landing page and for hosting some housekeeping github actions workflows and templates.
2525

2626
In addition to the `mandrel/XX.Y` branches Mandrel also includes `graal/X` branches like `graal/master`.
2727
These branches are mirrors of the corresponding upstream branch and are being synchronized and tested nightly, in an effort to detect breaking changes upstream as soon as possible.

0 commit comments

Comments
 (0)
Please sign in to comment.