You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+8-8Lines changed: 8 additions & 8 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -58,7 +58,7 @@ Before you submit your merge request consider the following guidelines:
58
58
* Make your changes in a new git branch:
59
59
60
60
```shell
61
-
git checkout -b my-fix-branch develop
61
+
git checkout -b my-fix-branch main
62
62
```
63
63
64
64
* Create your patch, **including appropriate test cases**.
@@ -79,7 +79,7 @@ Before you submit your merge request consider the following guidelines:
79
79
git push origin my-fix-branch
80
80
```
81
81
82
-
In Github, send a pull request to original develop branch: f.e. `terraform-aws-github-runner:develop`.
82
+
In Github, send a pull request to original main branch: f.e. `terraform-aws-github-runner:main`.
83
83
If we suggest changes, then:
84
84
85
85
* Make the required updates.
@@ -90,11 +90,11 @@ If we suggest changes, then:
90
90
If the PR gets too outdated we may ask you to rebase and force push to update the PR:
91
91
92
92
```shell
93
-
git rebase develop -i
93
+
git rebase main -i
94
94
git push origin my-fix-branch -f
95
95
```
96
96
97
-
_WARNING: Squashing or reverting commits and force-pushing thereafter may remove Github comments on code that were previously made by you or others in your commits. Avoid any form of rebasing unless necessary._
97
+
_WARNING: Squashing or reverting commits and force-pushing thereafter may remove Github comments on code that were previously made by you or others in your commits. Avoid any form of rebasing unless necessary.
98
98
99
99
That's it! Thank you for your contribution!
100
100
@@ -109,10 +109,10 @@ from the main (upstream) repository:
109
109
git push origin --delete my-fix-branch
110
110
```
111
111
112
-
* Check out the develop branch:
112
+
* Check out the main branch:
113
113
114
114
```shell
115
-
git checkout develop -f
115
+
git checkout main -f
116
116
```
117
117
118
118
* Delete the local branch:
@@ -121,10 +121,10 @@ from the main (upstream) repository:
121
121
git branch -D my-fix-branch
122
122
```
123
123
124
-
* Update your develop with the latest upstream version:
124
+
* Update your main with the latest upstream version:
Copy file name to clipboardExpand all lines: README.md
+2Lines changed: 2 additions & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -6,6 +6,8 @@ This [Terraform](https://www.terraform.io/) module creates the required infrastr
6
6
7
7
> 📢 [Upcoming v2](https://github.com/philips-labs/terraform-aws-github-runner/issues/2517): We are busy with merging `next` back in to `main`. From that moment on we will not actively support v1. We will maintain for some moment a `v1` branch. Default PR's will go only back into main (`v2`). In case you woul like to get work explicit back in `v1` consider a PR to `v1`.
8
8
9
+
> 📢 The branch `develop` is not used anymore, we have set the `main` branch as the default branch. Please ensure your open pull request are rebased against `main`.
10
+
9
11
> 📢 HELP WANTED: We are running the AWS self-hosted GitHub runners OS project in Philips Labs for over two years! And we are incredibly happy with all the feedback and contribution of the open-source community. In the next months we will speak at some conferences to share the solution and story of running this open-source project. Via [this questionaire](https://forms.office.com/r/j03CUzdLFp) we would like to gather feedback from the community to use in our talks.
0 commit comments