Adjust ci
This commit is contained in:
		
							parent
							
								
									f2b7ac1821
								
							
						
					
					
						commit
						8387662e83
					
				
							
								
								
									
										9
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							@ -58,10 +58,11 @@ jobs:
 | 
				
			|||||||
      - name: Get Qt
 | 
					      - name: Get Qt
 | 
				
			||||||
        run: python ./share/ci/get_qt.py
 | 
					        run: python ./share/ci/get_qt.py
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - name: Get dependencies
 | 
					      - name: Get leptonica
 | 
				
			||||||
        run: |
 | 
					        run: python ./share/ci/get_leptonica.py
 | 
				
			||||||
          python ./share/ci/get_leptonica.py
 | 
					
 | 
				
			||||||
          python ./share/ci/get_tesseract.py
 | 
					      - name: Get tesseract
 | 
				
			||||||
 | 
					        run: python ./share/ci/get_tesseract.py
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - name: Build
 | 
					      - name: Build
 | 
				
			||||||
        run: python ./share/ci/build.py
 | 
					        run: python ./share/ci/build.py
 | 
				
			||||||
 | 
				
			|||||||
@ -206,6 +206,8 @@ def apply_cmd_env(cmd):
 | 
				
			|||||||
        key, value = match.groups()
 | 
					        key, value = match.groups()
 | 
				
			||||||
        if key in os.environ and os.environ[key] == value:
 | 
					        if key in os.environ and os.environ[key] == value:
 | 
				
			||||||
            continue
 | 
					            continue
 | 
				
			||||||
 | 
					        if key in os.environ:
 | 
				
			||||||
 | 
					            print('Changing', key, '\nfrom\n', os.environ[key], '\nto\n', value)
 | 
				
			||||||
        if is_mingw and key.find('PATH') != -1 and value.find('/') != -1:
 | 
					        if is_mingw and key.find('PATH') != -1 and value.find('/') != -1:
 | 
				
			||||||
            value = value.replace(':', ';')
 | 
					            value = value.replace(':', ';')
 | 
				
			||||||
            value = re.sub(r'/(\w)/', r'\1:\\', value)
 | 
					            value = re.sub(r'/(\w)/', r'\1:\\', value)
 | 
				
			||||||
 | 
				
			|||||||
@ -69,3 +69,7 @@ c.set_make_threaded()
 | 
				
			|||||||
c.run('cmake {}'.format(cmake_args))
 | 
					c.run('cmake {}'.format(cmake_args))
 | 
				
			||||||
c.run('cmake --build . --config Release')
 | 
					c.run('cmake --build . --config Release')
 | 
				
			||||||
c.run('cmake --build . --target install --config Release')
 | 
					c.run('cmake --build . --target install --config Release')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if not check_existing(): # create links
 | 
				
			||||||
 | 
					    c.print('>> Build failed')
 | 
				
			||||||
 | 
					    exit(1)
 | 
				
			||||||
 | 
				
			|||||||
@ -72,3 +72,7 @@ c.set_make_threaded()
 | 
				
			|||||||
c.run('cmake {}'.format(cmake_args))
 | 
					c.run('cmake {}'.format(cmake_args))
 | 
				
			||||||
c.run('cmake --build . --config Release')
 | 
					c.run('cmake --build . --config Release')
 | 
				
			||||||
c.run('cmake --build . --target install --config Release')
 | 
					c.run('cmake --build . --target install --config Release')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if not check_existing(): # create links
 | 
				
			||||||
 | 
					    c.print('>> Build failed')
 | 
				
			||||||
 | 
					    exit(1)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user