workflows/cmake.yml:test on Ubuntu Jammy (22.04);migrate to checkoutv3

This should also fix MegaGlest#247
zetaglest · Aug 17, 2022 · 0018f3a · 0018f3a
1 parent e63d814
commit 0018f3a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -15,26 +15,25 @@ jobs:
       fail-fast: false
       matrix:
         arch: [x64]
-        os: [ubuntu-18.04, ubuntu-latest]
+        os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04]
         compiler: [gcc, clang]
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Get dependencies
-      run: |
-        sudo apt update
-        sudo mk/linux/setupBuildDeps.sh
+      run: sudo mk/linux/setupBuildDeps.sh
+
 
-    - name: Bulid MegaGlest With GCC Compiler
+    - name: Build MegaGlest With GCC Compiler
       if: ${{ matrix.compiler == 'gcc' }}
       env:
         CC: gcc
         CXX: g++
       run: mk/linux/build-mg.sh
 
-    - name: Bulid MegaGlest With Clang Compiler
+    - name: Build MegaGlest With Clang Compiler
       if: ${{ matrix.compiler == 'clang' }}
       env:
         CC: clang
@@ -75,7 +74,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Cache Vcpkg Libs
       uses: actions/cache@v2

diff --git a/mk/linux/setupBuildDeps.sh b/mk/linux/setupBuildDeps.sh
@@ -167,6 +167,10 @@ case $distribution in
 				#name > Focal Fossa
 				installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-gtk3-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn2-dev libpsl-dev libgnutls28-dev libnghttp2-dev libssh-dev libbrotli-dev"
 				;;
+			22.04)
+				#name > Jammy
+				installcommand="apt-get install $APT_OPTIONS cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libwxgtk3.0-gtk3-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn2-dev libpsl-dev libgnutls28-dev libnghttp2-dev libssh2-1-dev libbrotli-dev"
+				;;
 			*)
 				installcommand="apt-get install $APT_OPTIONS $packages_for_next_debian_ubuntu_mint"
 				unsupported_currently_this_OS="release"
@@ -185,7 +189,7 @@ case $distribution in
 				;;
 		esac
 		;;
-    
+
 	LinuxMint|Linuxmint)
 		case $release in
 			2)

diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
@@ -68,7 +68,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.21.3/include)
 		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/${SDL_WINDOWS_DIR_DINC}/include)
 		INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/include)
-				       
+
 		link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/lib)
 		link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
 		link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib)
@@ -79,9 +79,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 	ENDIF()
 
 	IF(WANT_USE_OpenSSL)
-		FIND_PACKAGE(OpenSSL)
+		FIND_PACKAGE(OPENSSL REQUIRED) # required for curl
 		IF(OPENSSL_FOUND)
 		    INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
+		    SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENSSL_LIBRARIES})
 		ELSE()
 		    MESSAGE(STATUS "**NOTE: OpenSSL is usually not required.")
 		ENDIF()
@@ -94,9 +95,6 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 		IF(NOT OPENSSL_FOUND)
 		    # default
 		    SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES})
-		ELSE()
-		    # mageia
-		    SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
 		ENDIF()
 	ENDIF()
 
@@ -158,7 +156,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 	            SET(HAVE_FONTCONFIG 1)
                     ADD_DEFINITIONS(-DHAVE_FONTCONFIG)
 
-	            INCLUDE_DIRECTORIES( ${FONTCONFIG_INCLUDE_DIR} ) 
+	            INCLUDE_DIRECTORIES( ${FONTCONFIG_INCLUDE_DIR} )
 	            SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${FONTCONFIG_LIBRARIES} )
 	        ENDIF(FONTCONFIG_FOUND)
         ENDIF()
@@ -262,12 +260,12 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 
 	SET(DIRS_WITH_SRC
         compression
-		feathery_ftp	
+		feathery_ftp
 		glew
 		graphics
 		graphics/gl
 		lua
-		map	
+		map
 		platform/common
 		sound
 		sound/openal
@@ -281,7 +279,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 			streflop/libm_flt32_source
             streflop/softfloat)
 	ENDIF()
-	
+
 	IF(FORCE_EMBEDDED_LIBS)
 		SET(FORCE_USE_EMBEDDED_Miniupnpc ON)
 	ELSE()
@@ -346,7 +344,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 		SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/posix)
 		SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/unix)
 	ENDIF()
-	
+
 	SET(MG_INCLUDES_ROOT "include/")
 	SET(MG_SOURCES_ROOT "sources/")
 	SET(MG_INCLUDE_FILES "")
@@ -427,7 +425,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 		SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/window_gl.cpp)
 		SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/win32_deps/src/glprocs.c)
 	ENDIF()
-	
+
 	FOREACH(DIR IN LISTS DIRS_WITH_SRC)
 		set(INCLUDE_DIR_TO_GLOB ${MG_INCLUDES_ROOT}${DIR})
 		INCLUDE_DIRECTORIES( ${INCLUDE_DIR_TO_GLOB} )
@@ -443,7 +441,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 		FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.cpp)
 		#MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}")
 		SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
-	
+
 		set(SRC_DIR_TO_GLOB ${MG_SOURCES_ROOT}${DIR})
 		#MESSAGE(STATUS "SRC_DIR_TO_GLOB: ${SRC_DIR_TO_GLOB}")
 		FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.c)
@@ -456,7 +454,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 			SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
 			FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.m)
 			#MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}")
-			SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})	
+			SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
 		ENDIF(APPLE)
 	ENDFOREACH(DIR)
 
@@ -472,9 +470,9 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
 		SET(PLATFORM_SPECIFIC_DEFINES "-DX11_AVAILABLE -DHAVE_SYS_IOCTL_H")
 	ENDIF()
 
-	SET_SOURCE_FILES_PROPERTIES(${MG_SOURCE_FILES} PROPERTIES COMPILE_FLAGS 
+	SET_SOURCE_FILES_PROPERTIES(${MG_SOURCE_FILES} PROPERTIES COMPILE_FLAGS
 		"${PLATFORM_SPECIFIC_DEFINES} ${STREFLOP_PROPERTIES} ${CXXFLAGS}")
-	
+
 	SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
 
 	IF(NOT WIN32)