Skip to content

Commit

Permalink
treewide: move to main branch as default branch
Browse files Browse the repository at this point in the history
  • Loading branch information
FFHener committed Jun 24, 2024
1 parent 59187a5 commit 0a4c367
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ We use github to host code, to track issues and feature requests, as well as acc
## We Use GitHub, So All Code Changes Happen Through Pull Requests
Pull requests are the best way to propose changes to the codebase. We actively welcome your pull requests:

1. Fork the repo and create your branch from `master`.
1. Fork the repo and create your branch from `main`.
2. If you've added code that should be tested, test it and describe your tests in the PR.
3. Make sure your code lints (it has correct syntax).
4. Make sure that every commit in your PR matches the formal requirements (see below).
Expand All @@ -30,7 +30,7 @@ as long and detailed as you wish.
Signed-off-by: $YOUR_SIGNATURE
```
You can add the signed-off-by line automatically via `git commit -s`.
You can add the signed-off-by line automatically via `git commit -s`.

## Any contributions you make will be under the GPLv3 Software License
In short, when you submit code changes, your submissions are understood to be under the same [GPLv3 License](http://www.gnu.org/licenses/gpl-3.0.html) that covers the project. Feel free to contact the maintainers if that's a concern.
Expand Down
2 changes: 1 addition & 1 deletion build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# TODO: use $dlmirror for repositories.conf as well

# To run this in a rootless podman container:
# podman run -i --rm --timeout=1800 --log-driver=none alpine:edge sh -c '( apk add git bash wget xz coreutils build-base gcc argp-standalone musl-fts-dev musl-obstack-dev musl-libintl abuild binutils ncurses-dev gawk bzip2 perl python3 rsync && git clone https://github.com/freifunk-berlin/falter-packages.git /root/falter-packages && cd /root/falter-packages/ && git checkout master && build/build.sh master x86_64 out/ ) >&2 && cd /root/falter-packages/out/ && tar -c *' > out.tar
# podman run -i --rm --timeout=1800 --log-driver=none alpine:edge sh -c '( apk add git bash wget xz coreutils build-base gcc argp-standalone musl-fts-dev musl-obstack-dev musl-libintl abuild binutils ncurses-dev gawk bzip2 perl python3 rsync && git clone https://github.com/freifunk-berlin/falter-packages.git /root/falter-packages && cd /root/falter-packages/ && git checkout main && build/build.sh main x86_64 out/ ) >&2 && cd /root/falter-packages/out/ && tar -c *' > out.tar

function usage() {
local br="$1"
Expand Down
2 changes: 1 addition & 1 deletion doc/compiling.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ Checking 'proper-umask'... ok.

The script will download the OpenWrt-SDK for the specific architecture and compile all packages in the feed. This works for local packages, that aren't checked into git too.

Please mind, that this will build the packagefeed, _but won't sign it_. Signing needs to be handled separately (i.e. automatic builds get signed on buildbot master).
Please mind, that this will build the packagefeed, _but won't sign it_. Signing needs to be handled separately (i.e. automatic builds get signed on buildbot main).
2 changes: 1 addition & 1 deletion doc/translation.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ to understand the rest of what we do here.

## get LuCI translation scripts

Run `fetch_translation_tools.sh` once. It will download the current luci-translation scripts from master and place them in the `build` directory. Please don't commit them, as they might change. If you feel, that those scripts aren't up to date, just run that script again.
Run `fetch_translation_tools.sh` once. It will download the current luci-translation scripts from main and place them in the `build` directory. Please don't commit them, as they might change. If you feel, that those scripts aren't up to date, just run that script again.

## prepare translation of a new app

Expand Down

0 comments on commit 0a4c367

Please sign in to comment.