Skip to content

Commit

Permalink
chore: Set main as default branch
Browse files Browse the repository at this point in the history
  • Loading branch information
npalm committed Dec 28, 2022
1 parent 68a96a1 commit abc53ca
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lambda-runner-binaries-syncer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Lambda Syncer
on:
push:
branches:
- develop
- main
pull_request:
paths:
- .github/workflows/lambda-runner-binaries-syncer.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lambda-runners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Lambda Runners
on:
push:
branches:
- develop
- main
pull_request:
paths:
- .github/workflows/lambda-runners.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lambda-webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Lambda Webhook
on:
push:
branches:
- develop
- main
pull_request:
paths:
- .github/workflows/lambda-webhook.yml
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/packer-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@ on:
push:
branches:
- main
- develop
pull_request:
paths:
- "images/**"
- ".github/workflows/packer-build.yml"
- "module/runners/templates/**"

env:
env:
AWS_REGION: eu-west-1

jobs:
verify_packer:
name: Verify packer
name: Verify packer
runs-on: ubuntu-latest
container:
image: hashicorp/packer:1.7.8
Expand All @@ -28,12 +27,12 @@ jobs:
steps:
- name: "Checkout"
uses: actions/checkout@v3

- name: packer init
run: packer init .

- name: check packer formatting
run: packer fmt -recursive -check=true .
run: packer fmt -recursive -check=true .

- name: packer validate
run: packer validate .
1 change: 0 additions & 1 deletion .github/workflows/terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
push:
branches:
- main
- develop
pull_request:
paths-ignore:
- "modules/*/lambdas/**"
Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Before you submit your merge request consider the following guidelines:
* Make your changes in a new git branch:

```shell
git checkout -b my-fix-branch develop
git checkout -b my-fix-branch main
```

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

In Github, send a pull request to original develop branch: f.e. `terraform-aws-github-runner:develop`.
In Github, send a pull request to original main branch: f.e. `terraform-aws-github-runner:main`.
If we suggest changes, then:

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

```shell
git rebase develop -i
git rebase main -i
git push origin my-fix-branch -f
```

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

That's it! Thank you for your contribution!
Expand All @@ -109,10 +109,10 @@ from the main (upstream) repository:
git push origin --delete my-fix-branch
```
* Check out the develop branch:
* Check out the main branch:
```shell
git checkout develop -f
git checkout main -f
```
* Delete the local branch:
Expand All @@ -121,10 +121,10 @@ from the main (upstream) repository:
git branch -D my-fix-branch
```
* Update your develop with the latest upstream version:
* Update your main with the latest upstream version:
```shell
git pull --ff upstream develop
git pull --ff upstream main
```
## <a name="info"></a> Info
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ This [Terraform](https://www.terraform.io/) module creates the required infrastr

> 📢 [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`.
> 📢 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`.
> 📢 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.
- [Motivation](#motivation)
Expand Down

0 comments on commit abc53ca

Please sign in to comment.