Skip to content
This repository was archived by the owner on Jan 16, 2025. It is now read-only.

Commit abc53ca

Browse files
committed
chore: Set main as default branch
1 parent 68a96a1 commit abc53ca

7 files changed

+17
-17
lines changed

Diff for: .github/workflows/lambda-runner-binaries-syncer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Lambda Syncer
22
on:
33
push:
44
branches:
5-
- develop
5+
- main
66
pull_request:
77
paths:
88
- .github/workflows/lambda-runner-binaries-syncer.yml

Diff for: .github/workflows/lambda-runners.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Lambda Runners
22
on:
33
push:
44
branches:
5-
- develop
5+
- main
66
pull_request:
77
paths:
88
- .github/workflows/lambda-runners.yml

Diff for: .github/workflows/lambda-webhook.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Lambda Webhook
22
on:
33
push:
44
branches:
5-
- develop
5+
- main
66
pull_request:
77
paths:
88
- .github/workflows/lambda-webhook.yml

Diff for: .github/workflows/packer-build.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@ on:
33
push:
44
branches:
55
- main
6-
- develop
76
pull_request:
87
paths:
98
- "images/**"
109
- ".github/workflows/packer-build.yml"
1110
- "module/runners/templates/**"
1211

13-
env:
12+
env:
1413
AWS_REGION: eu-west-1
1514

1615
jobs:
1716
verify_packer:
18-
name: Verify packer
17+
name: Verify packer
1918
runs-on: ubuntu-latest
2019
container:
2120
image: hashicorp/packer:1.7.8
@@ -28,12 +27,12 @@ jobs:
2827
steps:
2928
- name: "Checkout"
3029
uses: actions/checkout@v3
31-
30+
3231
- name: packer init
3332
run: packer init .
3433

3534
- name: check packer formatting
36-
run: packer fmt -recursive -check=true .
35+
run: packer fmt -recursive -check=true .
3736

3837
- name: packer validate
3938
run: packer validate .

Diff for: .github/workflows/terraform.yml

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ on:
33
push:
44
branches:
55
- main
6-
- develop
76
pull_request:
87
paths-ignore:
98
- "modules/*/lambdas/**"

Diff for: CONTRIBUTING.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Before you submit your merge request consider the following guidelines:
5858
* Make your changes in a new git branch:
5959

6060
```shell
61-
git checkout -b my-fix-branch develop
61+
git checkout -b my-fix-branch main
6262
```
6363

6464
* Create your patch, **including appropriate test cases**.
@@ -79,7 +79,7 @@ Before you submit your merge request consider the following guidelines:
7979
git push origin my-fix-branch
8080
```
8181

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`.
8383
If we suggest changes, then:
8484

8585
* Make the required updates.
@@ -90,11 +90,11 @@ If we suggest changes, then:
9090
If the PR gets too outdated we may ask you to rebase and force push to update the PR:
9191

9292
```shell
93-
git rebase develop -i
93+
git rebase main -i
9494
git push origin my-fix-branch -f
9595
```
9696

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.
9898

9999
That's it! Thank you for your contribution!
100100
@@ -109,10 +109,10 @@ from the main (upstream) repository:
109109
git push origin --delete my-fix-branch
110110
```
111111
112-
* Check out the develop branch:
112+
* Check out the main branch:
113113
114114
```shell
115-
git checkout develop -f
115+
git checkout main -f
116116
```
117117
118118
* Delete the local branch:
@@ -121,10 +121,10 @@ from the main (upstream) repository:
121121
git branch -D my-fix-branch
122122
```
123123
124-
* Update your develop with the latest upstream version:
124+
* Update your main with the latest upstream version:
125125
126126
```shell
127-
git pull --ff upstream develop
127+
git pull --ff upstream main
128128
```
129129
130130
## <a name="info"></a> Info

Diff for: README.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ This [Terraform](https://www.terraform.io/) module creates the required infrastr
66

77
> 📢 [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`.
88
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+
911
> 📢 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.
1012
1113
- [Motivation](#motivation)

0 commit comments

Comments
 (0)