Merge branch 'master' into nymkappa/menu
This commit is contained in:
		
						commit
						043ab008db
					
				
							
								
								
									
										13
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @ -27,8 +27,17 @@ jobs: | |||||||
|           node-version: ${{ matrix.node }} |           node-version: ${{ matrix.node }} | ||||||
|           registry-url: "https://registry.npmjs.org" |           registry-url: "https://registry.npmjs.org" | ||||||
| 
 | 
 | ||||||
|       - name: Install 1.63.x Rust toolchain |       - name: Read rust-toolchain file from repository | ||||||
|         uses: dtolnay/rust-toolchain@1.63 |         id: gettoolchain | ||||||
|  |         run: echo "::set-output name=toolchain::$(cat rust-toolchain)" | ||||||
|  |         working-directory: ${{ matrix.node }}/${{ matrix.flavor }} | ||||||
|  | 
 | ||||||
|  |       - name: Install ${{ steps.gettoolchain.outputs.toolchain }} Rust toolchain | ||||||
|  |         # Latest version available on this commit is 1.71.1 | ||||||
|  |         # Commit date is Aug 3, 2023 | ||||||
|  |         uses: dtolnay/rust-toolchain@f361669954a8ecfc00a3443f35f9ac8e610ffc06 | ||||||
|  |         with: | ||||||
|  |           toolchain: ${{ steps.gettoolchain.outputs.toolchain }} | ||||||
| 
 | 
 | ||||||
|       - name: Install |       - name: Install | ||||||
|         if: ${{ matrix.flavor == 'dev'}} |         if: ${{ matrix.flavor == 'dev'}} | ||||||
|  | |||||||
| @ -85,7 +85,7 @@ Install dependencies with `npm` and build the backend: | |||||||
| 
 | 
 | ||||||
| ``` | ``` | ||||||
| cd backend | cd backend | ||||||
| npm install | npm install --no-install-links # npm@9.4.2 and later can omit the --no-install-links | ||||||
| npm run build | npm run build | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -6,8 +6,6 @@ authors = ["mononaut"] | |||||||
| edition = "2021" | edition = "2021" | ||||||
| publish = false | publish = false | ||||||
| 
 | 
 | ||||||
| [workspace] |  | ||||||
| 
 |  | ||||||
| [lib] | [lib] | ||||||
| crate-type = ["cdylib"] | crate-type = ["cdylib"] | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -243,7 +243,7 @@ | |||||||
|         <img class="image" src="/resources/profile/ronindojo.png" /> |         <img class="image" src="/resources/profile/ronindojo.png" /> | ||||||
|         <span>RoninDojo</span> |         <span>RoninDojo</span> | ||||||
|       </a> |       </a> | ||||||
|       <a href="https://github.com/runcitadel/core" target="_blank" title="Citadel"> |       <a href="https://github.com/runcitadel" target="_blank" title="Citadel"> | ||||||
|         <img class="image" src="/resources/profile/runcitadel.svg" /> |         <img class="image" src="/resources/profile/runcitadel.svg" /> | ||||||
|         <span>Citadel</span> |         <span>Citadel</span> | ||||||
|       </a> |       </a> | ||||||
|  | |||||||
| @ -1 +1 @@ | |||||||
| 1.70 | 1.63 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user