mirror of
				https://github.com/DarkflameUniverse/DarkflameServer.git
				synced 2025-11-03 22:21:59 +00:00 
			
		
		
		
	ci fix
This commit is contained in:
		
							
								
								
									
										4
									
								
								.github/workflows/build-and-test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/build-and-test.yml
									
									
									
									
										vendored
									
									
								
							@@ -33,9 +33,7 @@ jobs:
 | 
				
			|||||||
    - name: cmake
 | 
					    - name: cmake
 | 
				
			||||||
      uses: lukka/run-cmake@v10
 | 
					      uses: lukka/run-cmake@v10
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        configurePreset: "ci-${{matrix.os}}"
 | 
					        workflowPreset: "ci-${{matrix.os}}"
 | 
				
			||||||
        buildPreset: "default"
 | 
					 | 
				
			||||||
        testPreset: "ci-${{matrix.os}}"
 | 
					 | 
				
			||||||
    - name: artifacts
 | 
					    - name: artifacts
 | 
				
			||||||
      uses: actions/upload-artifact@v4
 | 
					      uses: actions/upload-artifact@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -83,12 +83,40 @@
 | 
				
			|||||||
			"displayName": "Default Build",
 | 
								"displayName": "Default Build",
 | 
				
			||||||
			"description": "Default Build",
 | 
								"description": "Default Build",
 | 
				
			||||||
			"jobs": 2
 | 
								"jobs": 2
 | 
				
			||||||
 | 
							},
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
 | 
								"name": "windows-msvc",
 | 
				
			||||||
 | 
								"inherits": "default",
 | 
				
			||||||
 | 
								"configurePreset": "windows-msvc",
 | 
				
			||||||
 | 
								"displayName": "Windows (MSVC)",
 | 
				
			||||||
 | 
								"description": "This preset is used to build using the MSVC toolchain on Windows"
 | 
				
			||||||
 | 
							},
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
 | 
								"name": "linux-clang",
 | 
				
			||||||
 | 
								"inherits": "default",
 | 
				
			||||||
 | 
								"configurePreset": "linux-clang",
 | 
				
			||||||
 | 
								"displayName": "Linux (Clang)",
 | 
				
			||||||
 | 
								"description": "This preset is used to build using the Clang toolchain on Linux"
 | 
				
			||||||
 | 
							},
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
 | 
								"name": "linux-gnu",
 | 
				
			||||||
 | 
								"inherits": "default",
 | 
				
			||||||
 | 
								"configurePreset": "linux-gnu",
 | 
				
			||||||
 | 
								"displayName": "Linux (GNU)",
 | 
				
			||||||
 | 
								"description": "This preset is used to build using the GNU toolchain on Linux"
 | 
				
			||||||
 | 
							},
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
 | 
								"name": "macos",
 | 
				
			||||||
 | 
								"inherits": "default",
 | 
				
			||||||
 | 
								"configurePreset": "macos",
 | 
				
			||||||
 | 
								"displayName": "MacOS",
 | 
				
			||||||
 | 
								"description": "This preset is used to build on MacOS"
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	],
 | 
						],
 | 
				
			||||||
	"testPresets": [
 | 
						"testPresets": [
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"name": "ci-ubuntu-22.04",
 | 
								"name": "ci-ubuntu-22.04",
 | 
				
			||||||
			"configurePreset": "linux-clang",
 | 
								"configurePreset": "linux-gnu",
 | 
				
			||||||
			"displayName": "CI Tests on Linux",
 | 
								"displayName": "CI Tests on Linux",
 | 
				
			||||||
			"description": "Runs all tests on a linux configuration",
 | 
								"description": "Runs all tests on a linux configuration",
 | 
				
			||||||
			"execution": {
 | 
								"execution": {
 | 
				
			||||||
@@ -128,5 +156,64 @@
 | 
				
			|||||||
				}
 | 
									}
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
						],
 | 
				
			||||||
 | 
						"workflowPresets": [
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
 | 
								"name": "ci-windows-2022",
 | 
				
			||||||
 | 
								"displayName": "Windows (MSVC)",
 | 
				
			||||||
 | 
								"description": "CI workflow preset for Windows",
 | 
				
			||||||
 | 
								"steps": [
 | 
				
			||||||
 | 
									{
 | 
				
			||||||
 | 
										"type": "configure",
 | 
				
			||||||
 | 
										"name": "windows-msvc"
 | 
				
			||||||
 | 
									},
 | 
				
			||||||
 | 
									{
 | 
				
			||||||
 | 
										"type": "build",
 | 
				
			||||||
 | 
										"name": "windows-msvc"
 | 
				
			||||||
 | 
									},
 | 
				
			||||||
 | 
									{
 | 
				
			||||||
 | 
										"type": "test",
 | 
				
			||||||
 | 
										"name": "ci-windows-2022"
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
 | 
								]
 | 
				
			||||||
 | 
							},
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
 | 
								"name": "ci-ubuntu-22.04",
 | 
				
			||||||
 | 
								"displayName": "Linux (GNU)",
 | 
				
			||||||
 | 
								"description": "CI workflow preset for Ubuntu",
 | 
				
			||||||
 | 
								"steps": [
 | 
				
			||||||
 | 
									{
 | 
				
			||||||
 | 
										"type": "configure",
 | 
				
			||||||
 | 
										"name": "linux-gnu"
 | 
				
			||||||
 | 
									},
 | 
				
			||||||
 | 
									{
 | 
				
			||||||
 | 
										"type": "build",
 | 
				
			||||||
 | 
										"name": "linux-gnu"
 | 
				
			||||||
 | 
									},
 | 
				
			||||||
 | 
									{
 | 
				
			||||||
 | 
										"type": "test",
 | 
				
			||||||
 | 
										"name": "ci-ubuntu-22.04"
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
 | 
								]
 | 
				
			||||||
 | 
							},
 | 
				
			||||||
 | 
							{
 | 
				
			||||||
 | 
								"name": "ci-macos-13",
 | 
				
			||||||
 | 
								"displayName": "MacOS (Clang)",
 | 
				
			||||||
 | 
								"description": "CI workflow preset for MacOS",
 | 
				
			||||||
 | 
								"steps": [
 | 
				
			||||||
 | 
									{
 | 
				
			||||||
 | 
										"type": "configure",
 | 
				
			||||||
 | 
										"name": "macos"
 | 
				
			||||||
 | 
									},
 | 
				
			||||||
 | 
									{
 | 
				
			||||||
 | 
										"type": "build",
 | 
				
			||||||
 | 
										"name": "macos"
 | 
				
			||||||
 | 
									},
 | 
				
			||||||
 | 
									{
 | 
				
			||||||
 | 
										"type": "test",
 | 
				
			||||||
 | 
										"name": "ci-macos-13"
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
 | 
								]
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
	]
 | 
						]
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user