Merge remote-tracking branch 'origin/master'

This commit is contained in:
hirst 2024-05-29 11:32:23 +02:00
commit 7a744daff1

View file

@ -314,7 +314,7 @@ npm test
If plans go right, nixos Hydra will be used to compile packages, create docker images and also package source code in zip files. If plans go right, nixos Hydra will be used to compile packages, create docker images and also package source code in zip files.
By default the repos (both server and clients) will have a nix flake with `hydraJobs` that describe every step on how to build it. By default the repos (both server and clients) will have a nix flake with `hydraJobs` that describe every step on how to build it.
If plans gou south, as a backup actions will be used for this process. If plans go south, as a backup actions will be used for this process.
```mermaid ```mermaid
flowchart LR flowchart LR
@ -324,6 +324,19 @@ flowchart LR
C --> D(Deploy to test server) C --> D(Deploy to test server)
``` ```
## CD _Continuous Deployment_
After hydra build the packages, via actions a system configuration will be compiled and deployed onto a nixos virtual machine running on [4o1x5](https://git.4o1x5.dev/4o1x5.dev)'s nix server.
It will we a publicly accessible developer demo for testing.
```mermaid
flowchart LR
P[Push to dev] -->
A[Hydra builds packages]
A --> B[Actions issue a remote build to vm]
B --> C[VM restarts service]
```
## Git _Version control_ ## Git _Version control_
Since developers will choose their own features they want to implement, **creating a new branch for that feature, and developing there is a must!** By default if any other features get implemented into the main developer branch,that feature will need to be pulled and merged into the other development branch. Since developers will choose their own features they want to implement, **creating a new branch for that feature, and developing there is a must!** By default if any other features get implemented into the main developer branch,that feature will need to be pulled and merged into the other development branch.