mirror of
				https://github.com/YosysHQ/yosys
				synced 2025-10-31 03:32:29 +00:00 
			
		
		
		
	ci: simplify tests a bit
Remove compiler and cpp_std from `build-yosys` matrix. Using `config-$CC` will instead fall back to default values. Drop `Tool versions` step and introduce `yosys-config` output instead. Rename `test-builds` to `test-compile`.
This commit is contained in:
		
							parent
							
								
									8bc206928f
								
							
						
					
					
						commit
						9348221154
					
				
					 1 changed files with 10 additions and 24 deletions
				
			
		
							
								
								
									
										34
									
								
								.github/workflows/test-build.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										34
									
								
								.github/workflows/test-build.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -23,7 +23,7 @@ jobs: | ||||||
|           # only run on push *or* pull_request, not both |           # only run on push *or* pull_request, not both | ||||||
|           concurrent_skipping: 'same_content_newer' |           concurrent_skipping: 'same_content_newer' | ||||||
| 
 | 
 | ||||||
|   test-builds: |   test-compile: | ||||||
|     name: Compiler testing |     name: Compiler testing | ||||||
|     runs-on: ${{ matrix.os }} |     runs-on: ${{ matrix.os }} | ||||||
|     needs: pre_job |     needs: pre_job | ||||||
|  | @ -133,24 +133,13 @@ jobs: | ||||||
|           make -j$procs CXXSTD=$CXXSTD CC=$CC CXX=$CXX LD=$CC |           make -j$procs CXXSTD=$CXXSTD CC=$CC CXX=$CXX LD=$CC | ||||||
| 
 | 
 | ||||||
|   build-yosys: |   build-yosys: | ||||||
|     name: Reusable Yosys build |     name: Reusable build | ||||||
|     runs-on: ${{ matrix.os }} |     runs-on: ${{ matrix.os }} | ||||||
|     env: |     env: | ||||||
|       CC: ${{ matrix.compiler }} |       CC: clang | ||||||
|       CXX: ${{ matrix.compiler }} |  | ||||||
|       CXXSTD: ${{ matrix.cpp_std }} |  | ||||||
|     strategy: |     strategy: | ||||||
|       matrix: |       matrix: | ||||||
|         os: |         os: [ubuntu-20.04] | ||||||
|           - ubuntu-20.04 |  | ||||||
|         compiler: |  | ||||||
|           - 'clang' |  | ||||||
|         cpp_std: |  | ||||||
|           - 'c++11' |  | ||||||
|         include: |  | ||||||
|           # Add os_name |  | ||||||
|           - os: ubuntu-20.04 |  | ||||||
|             os_name: focal |  | ||||||
|       fail-fast: false |       fail-fast: false | ||||||
|     steps: |     steps: | ||||||
|       - name: Install Linux Dependencies |       - name: Install Linux Dependencies | ||||||
|  | @ -181,12 +170,6 @@ jobs: | ||||||
|           echo "$(brew --prefix flex)/bin" >> $GITHUB_PATH |           echo "$(brew --prefix flex)/bin" >> $GITHUB_PATH | ||||||
|           echo "procs=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV |           echo "procs=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV | ||||||
| 
 | 
 | ||||||
|       - name: Tool versions |  | ||||||
|         shell: bash |  | ||||||
|         run: | |  | ||||||
|           $CC --version |  | ||||||
|           $CXX --version |  | ||||||
| 
 |  | ||||||
|       - name: Checkout Yosys |       - name: Checkout Yosys | ||||||
|         uses: actions/checkout@v4 |         uses: actions/checkout@v4 | ||||||
| 
 | 
 | ||||||
|  | @ -195,8 +178,12 @@ jobs: | ||||||
|         run: | |         run: | | ||||||
|           mkdir build |           mkdir build | ||||||
|           cd build |           cd build | ||||||
|           make -f ../Makefile config-${CC%%-*} |           make -f ../Makefile config-$CC | ||||||
|           make -f ../Makefile -j$procs CXXSTD=$CXXSTD CC=$CC CXX=$CXX LD=$CC |           make -f ../Makefile -j$procs | ||||||
|  | 
 | ||||||
|  |       - name: Log yosys-config output | ||||||
|  |         run: | | ||||||
|  |           ./yosys-config || true | ||||||
| 
 | 
 | ||||||
|       - name: Log yosys-config output |       - name: Log yosys-config output | ||||||
|         run: | |         run: | | ||||||
|  | @ -209,7 +196,6 @@ jobs: | ||||||
|           tar -cvf ../build.tar share/ yosys yosys-* |           tar -cvf ../build.tar share/ yosys yosys-* | ||||||
| 
 | 
 | ||||||
|       - name: Store build artifact |       - name: Store build artifact | ||||||
|         if: (matrix.cpp_std == 'c++11') && (matrix.compiler == 'clang') |  | ||||||
|         uses: actions/upload-artifact@v4 |         uses: actions/upload-artifact@v4 | ||||||
|         with: |         with: | ||||||
|           name: build-${{ matrix.os }} |           name: build-${{ matrix.os }} | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue