Merge pull request #380 from cortex-command-community/linux-AppImage-generation

AppImage artifacts and ccache fix

Author: garethyr

.github/workflows/build-check.yml

@@ -4,10 +4,9 @@ name: Compile check
 on:
   # Triggers the workflow on push or pull request events but only for the development branch
   push:
-    branches: [ master, development ]
+    branches: [master, development]
   pull_request:
-    types: [opened, ready_for_review]
-    branches: [ master, development ]
+    types: [opened, reopened, ready_for_review, synchronize]
 
   workflow_dispatch:
 
@@ -28,16 +27,6 @@ jobs:
           sudo apt-get update -yq
           sudo apt-get install --no-install-recommends liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
 
-      - name: Cache
-        uses: actions/[email protected]
-        with:
-          # A list of files, directories, and wildcard patterns to cache and restore
-          path: |
-            ~/.cache
-            ~/.ccache
-          # An explicit key for restoring and saving the cache
-          key: ${{runner.os}}-build
-
       - name: Install Clang
         # You may pin to the exact commit or the version.
         # uses: egor-tensin/setup-clang@d16e36d5f8a7eb00aa6627c1a536d94dfc4a913d
@@ -47,22 +36,26 @@ jobs:
           cc: 1 # optional, default is 1
 
       - name: Setup ccache
-        # You may pin to the exact commit or the version.
-        # uses: alexjurkiewicz/setup-ccache@411d41a94dc67522f8aea0dbb5362240aaf31523
-        uses: alexjurkiewicz/[email protected]
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: build-check-${{runner.os}}-regressed
+          max-size: 5G
 
       - name: Build
         # You may pin to the exact commit or the version.
         # uses: BSFishy/meson-build@6f1930d878fd3eed3853c1c91285ec604c37f3a5
         uses: BSFishy/[email protected]
+        env:
+          CC: "ccache clang"
+          CXX: "ccache clang++"
+          CCACHE_SLOPPINESS: pch_defines,time_macros,include_file_mtime,include_file_ctime
         with:
           # The action to run
           setup-options: --buildtype=debug -Ddebug_type=full
           meson-version: 0.55.3
           ninja-version: 1.10.0
           action: build
 
-
   build-windows:
     env:
       # Path to the solution file relative to the root of the project.

.github/workflows/meson.yml

@@ -4,13 +4,14 @@ on:
   # Triggers the workflow on push or pull request events but only for the development branch
   push:
     branches: [ master, development ]
+  release:
   workflow_dispatch:
 
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
-  build:
+  build-release-linux:
     # The type of runner that the job will run on
     runs-on: ubuntu-20.04
 
@@ -20,21 +21,11 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-  
+
       - name: Install Dependencies
         run: |
           sudo apt-get update -yq
-          sudo apt-get install --no-install-recommends liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
- 
-      - name: Cache
-        uses: actions/[email protected]
-        with:
-          # A list of files, directories, and wildcard patterns to cache and restore
-          path: |
-            ~/.cache
-            ~/.ccache
-          # An explicit key for restoring and saving the cache
-          key: ${{runner.os}}-build
+          sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
 
       - name: Install Clang
         # You may pin to the exact commit or the version.
@@ -43,19 +34,50 @@ jobs:
         with:
           # Set up cc/c++ executables
           cc: 1 # optional, default is 1
- 
+
       - name: Setup ccache
-        # You may pin to the exact commit or the version.
-        # uses: alexjurkiewicz/setup-ccache@411d41a94dc67522f8aea0dbb5362240aaf31523
-        uses: alexjurkiewicz/[email protected]
-          
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: build-release-${{runner.os}}
+          max-size: 5G
+
       - name: Build
         # You may pin to the exact commit or the version.
         # uses: BSFishy/meson-build@6f1930d878fd3eed3853c1c91285ec604c37f3a5
         uses: BSFishy/[email protected]
+        env:
+          CC: "ccache clang"
+          CXX: "ccache clang++"
+          CCACHE_SLOPPINESS: pch_defines,time_macros,include_file_mtime,include_file_ctime
         with:
           # The action to run
+          setup-options: --buildtype=release -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/
           meson-version: 0.55.3
           ninja-version: 1.10.0
           action: build
 
+      - name: Create AppDir
+        run: |
+          echo "Setting output prefix"
+          DESTDIR=${GITHUB_WORKSPACE}/build/AppDir meson install -C $GITHUB_WORKSPACE"/build"
+
+      - name: Download linuxdeploy
+        working-directory: ${{env.GITHUB_WORKSPACE}}
+        run: |
+          wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -O lindeploy
+          chmod +x lindeploy
+
+      - name: Create AppImage
+        working-directory: ${{env.GITHUB_WORKSPACE}}
+        env:
+          LD_LIBRARY_PATH: ./external/lib/linux/x86_64/
+          OUTPUT: CortexCommand.AppImage
+        run: |
+          echo ${LD_LIBRARY_PATH}
+          ./lindeploy --appdir=build/AppDir --output appimage
+
+      - name: Upload Appimage
+        uses: actions/upload-artifact@v2
+        with:
+          name: CortexCommand.AppImage
+          path: CortexCommand.AppImage

Resources/cccp.desktop

@@ -3,5 +3,5 @@ Categories=Game;
 Type=Application
 Icon=cccp
 Name=Cortex Command (Community Project)
-Description=Choose between different factions, with their own set of expendable soldiers, mechas, and weapons. Protect your brain, mine gold, and destroy the enemy cortex in his bunker complex!
-Exec=CortexCommand
+Comment=Choose between different factions, with their own set of expendable soldiers, mechas, and weapons. Protect your brain, mine gold, and destroy the enemy cortex in his bunker complex!
+Exec=@EXERUNNER@

Resources/meson.build

@@ -1,6 +1,6 @@
 # User frontend
 desktop_file = files('cccp.desktop')
 icon_file = files('cccp.xpm')
-install_data('cccp.desktop', install_dir:get_option('datadir')/'applications', install_mode: 'rw-r--r--')
+configure_file(input: 'cccp.desktop', output: 'CortexCommand.desktop', install: true, install_dir:get_option('datadir')/'applications', install_mode: 'rw-r--r--', configuration: conf_data)
 install_data('cccp.xpm', install_dir: get_option('datadir')/'icons/hicolor/32x32/apps', install_mode:'rw-r--r--')
-configure_file(input: 'cccp.sh', output:'CortexCommand', install:true, install_dir: get_option('bindir'), install_mode:'rwxr-xr-x', configuration: conf_data)
+configure_file(input: 'cccp.sh', output:'CortexCommand', install: get_option('install_runner'), install_dir: get_option('bindir'), install_mode:'rwxr-xr-x', configuration: conf_data)

meson.build

@@ -33,7 +33,7 @@ if compiler.get_argument_syntax()== 'gcc' # used for gcc compatible compilers
   message('gcc detected')
 
   build_rpath = '$ORIGIN:$ORIGIN/../external/lib/linux/x86_64' # Set RUNPATH so that CCCP can find libfmod.so without needing to set LD_LIBRARY_PATH
-  suffix = 'x86_64'
+  #suffix = 'x86_64'
   link_args += ['-Wl,--enable-new-dtags'] # Set RUNPATH instead of RPATH
 
   # Set preprocessor flags and cpp arguments according to build options
@@ -101,6 +101,11 @@ else
   conf_data.set('EXENAME', elfname + '.' + suffix)
 endif
 
+if get_option('install_runner')
+  conf_data.set('EXERUNNER', 'CortexCommand')
+else
+  conf_data.set('EXERUNNER', conf_data.get('EXENAME'))
+endif
 
 #### Sources Setup ####
 pch = 'System/StandardIncludes.h'
@@ -156,8 +161,10 @@ base_exclude_files = [
 	'Start Dedicated Server.bat'
 ]
 
+if get_option('install_data')
 install_subdir(get_option('cccpdatadir'),
                exclude_directories:['.git', '.github', 'Metagames.rte', 'Scenes.rte'],
                exclude_files:base_exclude_files,
                install_dir:get_option('data_install_dir'),
                strip_directory:true)
+endif

meson_options.txt

@@ -3,3 +3,5 @@ option('cccpdatadir', type:'string', value:'../Cortex-Command-Community-Project-
 option('data_install_dir', type:'string', value:'share/CortexCommand', description: 'Where to install the data files relative to prefix directory')
 option('install_fmod', type:'boolean', value:true, description: 'Wether to install the fmod library.')
 option('fmod_dir', type:'string', value:'/opt/CortexCommand/lib', description: 'Where to install the fmod library.')
+option('install_data', type: 'boolean', value: true, description: 'Whether to install the data repo.')
+option('install_runner', type: 'boolean', value: true, description: 'Whether to install the runner script.')