Compare commits
	
		
			2 commits
		
	
	
		
			82a13d8c3d
			...
			5c278fc915
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 5c278fc915 | |||
| 831ecad40c | 
					 6 changed files with 19 additions and 10 deletions
				
			
		
							
								
								
									
										7
									
								
								Makefile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								Makefile
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,7 @@ | ||||||
|  | run: | ||||||
|  | 	@mdbook serve --open | ||||||
|  | deploy: | ||||||
|  | 	@mdbook clean | ||||||
|  | 	@mdbook build | ||||||
|  | 	@rsync -rauz --del --groupmap=erin:www-data --progress book/ erin@is-cute.ml:~/mercury-book | ||||||
|  | 	@git push -u origin main | ||||||
|  | @ -8,15 +8,14 @@ | ||||||
|         - [Security Features](development/design/security.md) |         - [Security Features](development/design/security.md) | ||||||
|         - [Microkernel](development/design/kernel.md) |         - [Microkernel](development/design/kernel.md) | ||||||
|         - [GUI](development/design/gui.md) |         - [GUI](development/design/gui.md) | ||||||
|         - [Filesystem](development/filesystem.md) |         - [Filesystem](development/design/filesystem.md) | ||||||
|     - [Configuring a Build Environment](development/environment.md) |     - [Configuring a Build Environment](development/environment.md) | ||||||
|     - [Development Workflow](development/workflow.md) |     - [Development Workflow](development/workflow.md) | ||||||
|     - [Running Tests](development/tests.md) |  | ||||||
| - [Using the OS](user/README.md) | - [Using the OS](user/README.md) | ||||||
|     - [Running in a Virtual Machine](user/virtual-machine.md) |     - [Running in a Virtual Machine]() | ||||||
|     - [Running on Baremetal](user/baremetal.md) |     - [Running on Baremetal]() | ||||||
|     - [General Use](user/use/README.md) |     - [General Use]() | ||||||
|         - [Working in the Shell](user/use/shell.md) |         - [Working in the Shell]() | ||||||
|         - [Navigating the GUI](user/use/gui.md) |         - [Navigating the GUI]() | ||||||
|         - [Configuring the System](user/use/config.md) |         - [Configuring the System]() | ||||||
|         - [Working with Actors](user/use/actors.md) |         - [Working with Actors]() | ||||||
|  |  | ||||||
|  | @ -1 +0,0 @@ | ||||||
| # Running Tests |  | ||||||
|  | @ -28,3 +28,6 @@ Use inline [rustdoc](https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html) to | ||||||
| ## 4. Push | ## 4. Push | ||||||
| Push the code to a new branch in the repository. | Push the code to a new branch in the repository. | ||||||
| If it's ready and fully working, make a pull request to merge it into `main`. | If it's ready and fully working, make a pull request to merge it into `main`. | ||||||
|  | 
 | ||||||
|  | ## 5. CI | ||||||
|  | Eventually, I want to have **CI** enabled, to allow automated tests, checking, and releases. | ||||||
|  |  | ||||||
|  | @ -1 +1,2 @@ | ||||||
| # Using the OS | # Using the OS | ||||||
|  | Once we actually have a working `kernel`, information on running it will be added here! | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue