fix docker image
This commit is contained in:
		@@ -1,6 +1,6 @@
 | 
				
			|||||||
include: '/Docker/Linux_Conan/.gitlab-ci.yml'
 | 
					include: '/Docker/Linux_Conan/.gitlab-ci.yml'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
image: luki42/dynuiprefresher_build:conanbuild
 | 
					image: conanio/gcc10
 | 
				
			||||||
 | 
					
 | 
				
			||||||
stages:
 | 
					stages:
 | 
				
			||||||
  - docker
 | 
					  - docker
 | 
				
			||||||
@@ -13,12 +13,13 @@ cache:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
conan:
 | 
					conan:
 | 
				
			||||||
  stage: build
 | 
					  stage: build
 | 
				
			||||||
  script:
 | 
					  before_script:
 | 
				
			||||||
    - conan profile new default --detect --force # Generates default profile detecting GCC and sets old ABI
 | 
					    - conan profile new default --detect --force # Generates default profile detecting GCC and sets old ABI
 | 
				
			||||||
    - conan profile update settings.compiler.libcxx=libstdc++11 default  # Sets libcxx to C++11 ABI
 | 
					    - conan profile update settings.compiler.libcxx=libstdc++11 default  # Sets libcxx to C++11 ABI
 | 
				
			||||||
    - mkdir -p build # create build folder
 | 
					    - mkdir -p build # create build folder
 | 
				
			||||||
    - CONAN_SYSREQUIRES_MODE=disabled conan install . --build=missing -g cmake -if build
 | 
					    - CONAN_SYSREQUIRES_MODE=enabled CONAN_SYSREQUIRES_SUDO=0 conan install . --build=missing -g cmake -if build
 | 
				
			||||||
    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF #cmake project
 | 
					  script:
 | 
				
			||||||
 | 
					    - cmake -S . -B build -D WinBuild=OFF #cmake project
 | 
				
			||||||
    - cd build
 | 
					    - cd build
 | 
				
			||||||
    - make -j4 #build
 | 
					    - make -j4 #build
 | 
				
			||||||
  artifacts:
 | 
					  artifacts:
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user