mirror of
				https://github.com/luanti-org/luanti.git
				synced 2025-10-31 15:35:21 +01:00 
			
		
		
		
	Update some workflows to newer Ubuntu versions (#14668)
This commit is contained in:
		
							
								
								
									
										6
									
								
								util/ci/build_luajit.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										6
									
								
								util/ci/build_luajit.sh
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| #!/bin/bash -eu | ||||
| cd $HOME | ||||
| git clone --depth 1 https://github.com/LuaJIT/LuaJIT | ||||
| pushd LuaJIT | ||||
| make -j$(nproc) | ||||
| popd | ||||
| @@ -1,7 +1,7 @@ | ||||
| #! /bin/bash -eu | ||||
|  | ||||
| #!/bin/bash -eu | ||||
| cd /tmp | ||||
| git clone --recursive https://github.com/jupp0r/prometheus-cpp | ||||
| git clone --recursive --depth 1 --shallow-submodules \ | ||||
| 	https://github.com/jupp0r/prometheus-cpp | ||||
| mkdir prometheus-cpp/build | ||||
| cd prometheus-cpp/build | ||||
| cmake .. \ | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
| install_linux_deps() { | ||||
| 	local pkgs=( | ||||
| 		cmake gettext postgresql | ||||
| 		libpng-dev libjpeg-dev libgl1-mesa-dev libsdl2-dev | ||||
| 		libpng-dev libjpeg-dev libgl1-mesa-dev libsdl2-dev libfreetype-dev | ||||
| 		libsqlite3-dev libhiredis-dev libogg-dev libgmp-dev libvorbis-dev | ||||
| 		libopenal-dev libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev | ||||
| 	) | ||||
| @@ -12,11 +12,16 @@ install_linux_deps() { | ||||
| 	sudo apt-get update | ||||
| 	sudo apt-get install -y --no-install-recommends "${pkgs[@]}" "$@" | ||||
|  | ||||
| 	sudo systemctl start postgresql.service | ||||
| 	sudo -u postgres psql <<<" | ||||
| 		CREATE USER minetest WITH PASSWORD 'minetest'; | ||||
| 		CREATE DATABASE minetest; | ||||
| 	" | ||||
| 	# set up Postgres for unit tests | ||||
| 	if [ -n "$MINETEST_POSTGRESQL_CONNECT_STRING" ]; then | ||||
| 		sudo systemctl start postgresql.service | ||||
| 		sudo -u postgres psql <<<" | ||||
| 			CREATE USER minetest WITH PASSWORD 'minetest'; | ||||
| 			CREATE DATABASE minetest; | ||||
| 			\c minetest | ||||
| 			GRANT ALL ON SCHEMA public TO minetest; | ||||
| 		" | ||||
| 	fi | ||||
| } | ||||
|  | ||||
| # macOS build only | ||||
|   | ||||
| @@ -1,15 +0,0 @@ | ||||
| #!/bin/sh -e | ||||
| name=${CONTAINER_IMAGE}/server | ||||
|  | ||||
| # build and publish Docker image (gitlab-ci) | ||||
|  | ||||
| docker build . \ | ||||
| 	-t ${name}:${CI_COMMIT_SHA} \ | ||||
| 	-t ${name}:${CI_COMMIT_REF_NAME} \ | ||||
| 	-t ${name}:latest | ||||
|  | ||||
| docker push ${name}:${CI_COMMIT_SHA} | ||||
| docker push ${name}:${CI_COMMIT_REF_NAME} | ||||
| [ "$CI_COMMIT_BRANCH" = master ] && docker push ${name}:latest | ||||
|  | ||||
| exit 0 | ||||
		Reference in New Issue
	
	Block a user