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
All PlanktoScope repositories use the `main` branch for their main
branch. I renamed `master` branch to `main` for the
PlanktoScope/PlanktoScope repo as well.
Since I used the GitHub branch rename feature, all redirections should
work.
For local git repository please follow these instuctions:
```sh
git branch -m master main
git fetch origin
git branch -u origin/main main
git remote set-head origin -a
```
Copy file name to clipboardExpand all lines: CHANGELOG.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -15,7 +15,7 @@ All dates in this file are given in the [UTC time zone](https://en.wikipedia.org
15
15
- (System: networking) If you plug in a supported USB Wi-Fi dongle into the PlanktoScope, now it will by default automatically create a Wi-Fi hotspot network from that Wi-Fi dongle - regardless of whether the PlanktoScope's internal Wi-Fi module is configured to also create the same Wi-Fi hotspot network or to connect to some external Wi-Fi network. This means that the PlanktoScope now supports creating its own Wi-Fi hotspot while simultaneously being connected to the internet via a Wi-Fi network, if you plug in a USB Wi-Fi dongle.
16
16
- (System: networking) If the PlanktoScope is connected to a Wi-Fi network with a captive portal, you should be able to access and proceed through the captive portal from a computer/phone connected to the PlanktoScope.
17
17
- (System: networking) Firewalld is now enabled, and default firewall policies are provided (via Forklift) for the `public` and `nm-shared` firewall zones. This means that if you want to access any additional ports besides the ports for programs provided with the standard PlanktoScope OS from other devices, now you must add configurations to open those additional ports, e.g. via drop-in configuration snippets in `/etc/firewalld/zones.d`.
18
-
- (Developers) Developer Mode and [Tips and Tricks page](https://github.com/PlanktoScope/PlanktoScope/blob/master/documentation/docs/community/contribute/tips-and-tricks.md)
18
+
- (Developers) [Tips and Tricks page](https://github.com/PlanktoScope/PlanktoScope/blob/main/documentation/docs/community/contribute/tips-and-tricks.md)
19
19
- (System) Enable [CQE](https://www.raspberrypi.com/news/sd-cards-and-bumper/) for significantly faster sdcard speed (Raspberry PI 5 only)
20
20
- (System) Enable [SDRAM tuning](https://www.jeffgeerling.com/blog/2024/raspberry-pi-boosts-pi-5-performance-sdram-tuning) improvements for faster processing
Copy file name to clipboardExpand all lines: documentation/README.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -8,7 +8,7 @@ This directory contains the PlanktoScope's documentation system. Documentation s
8
8
9
9
You can view the published documentation at the following URLs:
10
10
11
-
-<https://docs-edge.planktoscope.community/>: this shows the "edge" (i.e. development) version of documentation on the `master` branch of the main PlanktoScope repository at https://github.com/PlanktoScope/PlanktoScope . Note that this version probably contains errors and broken content, and it is not an official release of the documentation. This version of the documentation is hosted as a way for documentation maintainers to preview changes while working together across pull requests.
11
+
-<https://docs-edge.planktoscope.community/>: this shows the "edge" (i.e. development) version of documentation on the `main` branch of the main PlanktoScope repository at https://github.com/PlanktoScope/PlanktoScope . Note that this version probably contains errors and broken content, and it is not an official release of the documentation. This version of the documentation is hosted as a way for documentation maintainers to preview changes while working together across pull requests.
12
12
-<https://docs-beta.planktoscope.community/>: this shows the "beta" version of documentation on the `beta` branch of the main PlanktoScope repository. This version is shown to beta testers; it probably has problems, but it is more reliable than the "edge" version
13
13
-<https://docs.planktoscope.community>: this shows the "stable" version of documentation on the `stable` branch of the main PlanktoScope repository. This is the up-to-date version of PlanktoScope documentation which all PlanktoScope users should refer to as the official documentation website.
14
14
@@ -68,4 +68,4 @@ poetry run poe build
68
68
69
69
#### Publishing your changes
70
70
71
-
To publish your changes, make a [pull request](https://github.com/PlanktoScope/PlanktoScope/pulls) on our GitHub repository with a branch titled `feature/docs-<description of your changes>` (e.g. `feature/docs-fix-broken-link` or `feature/docs-improve-assembly-instructions`), and configure the pull request to merge the branch into the `master` branch. Once we merge the pull request, your changes will be published to the "edge" version of our documentation website (see the above "View the documentation" section of this README for the URL of the "edge" version of our documentation website).
71
+
To publish your changes, make a [pull request](https://github.com/PlanktoScope/PlanktoScope/pulls) on our GitHub repository with a branch titled `feature/docs-<description of your changes>` (e.g. `feature/docs-fix-broken-link` or `feature/docs-improve-assembly-instructions`), and configure the pull request to merge the branch into the `main` branch. Once we merge the pull request, your changes will be published to the "edge" version of our documentation website (see the above "View the documentation" section of this README for the URL of the "edge" version of our documentation website).
Copy file name to clipboardExpand all lines: documentation/docs/community/contribute/github.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
@@ -11,17 +11,17 @@ This repository is also a good way to get involved. Please fill in an issue if y
11
11
## Assumptions
12
12
13
13
1.**You're familiar with [git](https://git-scm.com/) and the [Merge Request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)(PR) workflow.**
14
-
2.**You've read the PlanktoScope [documentation](../../index.md).
14
+
2.**You've read the PlanktoScope [documentation](../../index.md).**
15
15
3.**You know about the PlanktoScope [community on Slack](https://planktoscope.slack.com/). Please use this for help.**
16
16
17
17
## How to Contribute
18
18
19
19
1. Make sure that the contribution you want to make is explained or detailed in a GitHub issue! Find an [existing issue](https://github.com/PlanktoScope/PlanktoScope/issues) or [open a new one](https://github.com/PlanktoScope/PlanktoScope/issues/new/choose).
20
-
2. Once done, [fork the PlanktoScope repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo) in your Github account. Ask a mastertainer if you want your issue to be checked before making a PR.
20
+
2. Once done, [fork the PlanktoScope repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo) in your Github account. Ask a maintainer if you want your issue to be checked before making a PR.
21
21
3.[Create a new Git branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository).
22
-
4. Review the [Development Workflow](#development-workflow) section that describes the steps to mastertain the repository.
22
+
4. Review the [Development Workflow](#development-workflow) section that describes the steps to maintainer the repository.
23
23
5. Make the changes on your branch.
24
-
6.[Submit the branch as a PR](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request) pointing to the `master` branch of the master fabcity-os-core-chart repository. A mastertainer should comment and/or review your Pull Request within a few days. Although depending on the circumstances, it may take longer. We do not enforce a naming convention for the PRs, but **please use something descriptive of your changes**, having in mind that the title of your PR will be automatically added to the next [release changelog](https://github.com/PlanktoScope/PlanktoScope/releases).
24
+
6.[Submit the branch as a PR](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request) pointing to the `main` branch of the main PlanktoScope repository. A maintainer should comment and/or review your Pull Request within a few days. Although depending on the circumstances, it may take longer. We do not enforce a naming convention for the PRs, but **please use something descriptive of your changes**, having in mind that the title of your PR will be automatically added to the next [release changelog](https://github.com/PlanktoScope/PlanktoScope/releases).
25
25
26
26
## Git Guidelines
27
27
@@ -47,8 +47,8 @@ Some notes on PRs:
47
47
48
48
-[Convert your PR as a draft]() if your changes are a work in progress: no one will review it until you pass your PR as ready for review.<br>
49
49
The draft PR can be very useful if you want to show that you are working on something and make your work visible.
50
-
- The branch related to the PR must be **up-to-date with `master`** before merging. Fortunately, this project [integrates a bot]() to automatically enforce this requirement without the PR author having to do it manually.
51
-
- All PRs must be reviewed and approved by at least one mastertainer.
50
+
- The branch related to the PR must be **up-to-date with `main`** before merging. Fortunately, this project [integrates a bot]() to automatically enforce this requirement without the PR author having to do it manually.
51
+
- All PRs must be reviewed and approved by at least one maintainer.
52
52
- The PR title should be accurate and descriptive of the changes. The title of the PR will be indeed automatically added to the next [release changelogs]().
53
53
54
54
## Release Process (for internal team only)
@@ -64,8 +64,8 @@ _[Read more about this]()._
64
64
65
65
⚠️ Before doing anything, make sure you got through the guide about [Releasing an Integration]().
66
66
67
-
⚠️ Every PR that is merged to `master` introducing changes to the PlanktoScope needs to modify the file [``](), by increasing the version of the chart accordingly.
67
+
⚠️ Every PR that is merged to `main` introducing changes to the PlanktoScope needs to modify the file [``](), by increasing the version of the chart accordingly.
68
68
69
-
Every PR that is merged to `master` triggers the automated release process, as specified at [``](). A GitHub Action will be triggered and publish a new release on the GitHub repository [releases](). This will enable users to start using the new version of the chart immediately after publishing.
69
+
Every PR that is merged to `main` triggers the automated release process, as specified at [``](). A GitHub Action will be triggered and publish a new release on the GitHub repository [releases](). This will enable users to start using the new version of the chart immediately after publishing.
70
70
71
71
Thank you again for reading this through, we can not wait to begin to work with you if you made your way through this contributing guide ❤️
Copy file name to clipboardExpand all lines: documentation/docs/community/contribute/tips-and-tricks.md
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -15,11 +15,11 @@ This page provides useful snippets and how-tos while developing software for the
15
15
16
16
## Development OS
17
17
18
-
You can find the latest build of PlanktoScope OS in [actions](https://github.com/PlanktoScope/PlanktoScope/actions/workflows/build-os-bookworm.yml?query=branch%3Amaster)
18
+
You can find the latest build of PlanktoScope OS in [actions](https://github.com/PlanktoScope/PlanktoScope/actions/workflows/build-os-bookworm.yml?query=branch%main)
19
19
20
20
It is built upon [Raspberry Pi OS Lite 64-bit](https://www.raspberrypi.com/software/operating-systems/#raspberry-pi-os-64-bit).
21
21
22
-
1. Choose the branch (e.g. `master`)
22
+
1. Choose the branch (e.g. `main`)
23
23
2. Click on the most recent action in the table
24
24
3. Download one of the Artifact depending on your PlanktoScope hardware
0 commit comments