Merge pull request #65 from rollerozxa/ci-and-more

CI (and more)

.github/workflows/build.yml

@@ -0,0 +1,96 @@
+name: build
+
+on:
+  push:
+    paths:
+      - 'src/**'
+      - 'build-*/**'
+      - '.github/workflows/**.yml'
+  pull_request:
+    paths:
+      - 'src/**'
+      - 'build-*/**'
+      - '.github/workflows/**.yml'
+
+jobs:
+  linux:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk2.0-dev libgl-dev libxss-dev libxxf86vm-dev libasound2-dev libudev-dev valgrind libcurl4-openssl-dev libpng-dev libjpeg-dev libfreetype6-dev libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-gfx-dev
+      - name: Build
+        run: |
+          cd build-linux/
+          ./autogen.sh
+          ./configure
+          ./go --silent --release
+
+  windows:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          install: >-
+            base-devel
+            mingw-w64-x86_64-toolchain
+            autotools
+            mingw-w64-x86_64-curl
+            mingw-w64-x86_64-gtk2
+            mingw-w64-x86_64-libpng
+            mingw-w64-x86_64-libjpeg-turbo
+            mingw-w64-x86_64-freetype
+            mingw-w64-x86_64-SDL2
+            mingw-w64-x86_64-SDL2_gfx
+            mingw-w64-x86_64-SDL2_image
+            mingw-w64-x86_64-SDL2_mixer
+            mingw-w64-x86_64-SDL2_ttf
+            mingw-w64-x86_64-nsis
+      - name: Build
+        run: |
+          cd build-windows/
+          ./autogen.sh
+          ./configure
+          ./go --silent --release
+
+      - name: Bundle together
+        run: |
+          cd build-windows/
+          mkdir release
+          cp principia.exe release/
+          ./mingw-bundledlls release/principia.exe --copy
+          makensis principia_install
+
+      - name: Upload output as artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: principia-setup.exe
+          path: build-windows/principia-setup.exe
+
+  android:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends openjdk-11-jdk-headless
+      - name: Build with gradle
+        run: |
+          cd build-android
+          ./gradlew assemblerelease
+      - name: Save apk artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: principia-release-unsigned.apk
+          path: build-android/principia/build/outputs/apk/release/principia-release-unsigned.apk
+

build-android/principia/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.bithack.principia"
         minSdk 14
         targetSdk 32
-        versionCode 35
-        versionName "1.5.2"
+        versionCode 34
+        versionName "1.5.2 Beta"
 
         externalNativeBuild {
             ndkBuild {

build-windows/go

@@ -73,8 +73,7 @@ if [ "$release" -eq "1" ]; then
     CXXFLAGS="$RELEASEFLAGS_CXX"
     CPPFLAGS="$RELEASEFLAGS_CXX"
     LDFLAGS="$RELEASEFLAGS_LD"
-    mingw32-make CFLAGS="$RELEASEFLAGS_CC" CXXFLAGS="$RELEASEFLAGS_CXX" LDFLAGS="$RELEASEFLAGS_LD" -j9
-    $makecmd CFLAGS="$RELEASEFLAGS_CC" CXXFLAGS="$RELEASEFLAGS_CXX" LDFLAGS="$RELEASEFLAGS_LD"
+    $makecmd CFLAGS="$RELEASEFLAGS_CC" CXXFLAGS="$RELEASEFLAGS_CXX" LDFLAGS="$RELEASEFLAGS_LD" -j9
     exit
 fi
 

build-windows/mingw-bundledlls

@@ -33,7 +33,8 @@ import shutil
 DEFAULT_PATH_PREFIXES = [
     "", "/usr/bin", "/usr/i686-w64-mingw32/sys-root/mingw/bin", "/mingw64/bin",
     "/usr/i686-w64-mingw32/sys-root/mingw/lib",
-    "C:\\msys64\\mingw64\\bin"
+    "C:\\msys64\\mingw64\\bin",
+    "D:\\a\\_temp\\msys64\\mingw64\\bin\\" # Github workflow's MSYS2 install
 ]
 
 env_path_prefixes = os.environ.get('MINGW_BUNDLEDLLS_SEARCH_PATH', None)
@@ -53,7 +54,7 @@ blacklist = [
     "usp10.dll", "comctl32.dll", "wsock32.dll", "netapi32.dll", "userenv.dll",
     "avicap32.dll", "avrt.dll", "psapi.dll", "mswsock.dll", "glu32.dll",
     "bcrypt.dll", "rpcrt4.dll", "hid.dll",
-    # directx 3d 11 
+    # directx 3d 11
     "d3d11.dll", "dxgi.dll"
 ]
 

build-windows/principia_install.nsi

@@ -2,12 +2,12 @@
 
 !define MUI_ICON "icon.ico"
 !define /ifndef VER_MAJOR 1
-!define /ifndef VER_MINOR 6
-!define /ifndef VER_BUILD 0
+!define /ifndef VER_MINOR 5
+!define /ifndef VER_BUILD 2
 
-!define /ifndef VER_REVISION 1600
+!define /ifndef VER_REVISION 1520
 
-!define /ifndef VERSION 'beta-windows'
+!define /ifndef VERSION '1.5.2 Beta'
 
 Name "Principia"
 OutFile "principia-setup.exe"
@@ -65,7 +65,7 @@ Section "Core Files (required)" SecCore
   SetOverwrite on
 
   SetOutPath "$INSTDIR"
-  
+
   File "release\principia.exe"
   File "release\*.dll"
 
@@ -74,15 +74,16 @@ Section "Core Files (required)" SecCore
   File /r /x *.sw* "..\data-pc\sfx"
   File /r /x *.sw* "..\data-pc\textures"
   SetOutPath "$INSTDIR\data-shared"
+  File /r /x *.sw* "..\data-shared\bg"
   File /r /x *.sw* "..\data-shared\fonts"
   File /r /x *.sw* "..\data-shared\icons"
   File /r /x *.sw* "..\data-shared\lang"
-  File /r /x *.sw* "..\data-shared\bg"
   File /r /x *.sw* "..\data-shared\lvl"
   File /r /x *.sw* "..\data-shared\models"
   File /r /x *.sw* "..\data-shared\pkg"
-  File /r /x *.sw* "..\data-shared\textures"
   File /r /x *.sw* "..\data-shared\shaders"
+  File /r /x *.sw* "..\data-shared\textures"
+  File /r /x *.sw* "..\data-shared\tiles"
 
 SectionEnd