refactor build and CI

Author: Velaron

.github/workflows/build.yml

@@ -1,85 +1,68 @@
-name: Build
-on:
-  push:
-    branches:
-      - main
-      - new-mod-api
+name: Build and Deploy
+on: [push, pull_request]
 
 jobs:
   android:
     name: Android
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: recursive
-      - name: Fetch YaPB Graphs from DB
-        run: scripts/yapb_graph_dl.sh
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
           cache: gradle
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-      - name: Build
-        run: ./gradlew assembleCi
-        working-directory: android
-      - name: Sign APK
-        uses: r0adkll/sign-android-release@v1
-        with:
-          releaseDirectory: android/app/build/outputs/apk/ci
-          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
-          alias: ${{ secrets.ALIAS }}
-          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}
+      - name: Build and Sign APK
         env:
-          BUILD_TOOLS_VERSION: "34.0.0"
+          KEYSTORE_FILE_PATH: ${{ github.workspace }}/signingkey.jks
+          KEYSTORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        run: |
+          echo "${{ secrets.SIGNING_KEY }}" | base64 --decode > ${{ env.KEYSTORE_FILE_PATH }}
+          ./gradlew assembleGitContinuous
+          mv app/build/outputs/apk/git/continuous/app-git-continuous.apk CS16Client-Android.apk
+        working-directory: android
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: Android
-          path: android/app/build/outputs/apk/ci/app-ci-unsigned-signed.apk
+          path: android/CS16Client-Android.apk
   psvita:
     name: PS Vita
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: recursive
       - name: Install dependencies
         run: |
           sudo apt-get update
           sudo apt-get install libatomic1 libgcc-s1 \
-            libstdc++6 gcc-multilib g++-multilib cmake \
+            libstdc++6 gcc-multilib g++-multilib \
             ninja-build libfontconfig-dev
       - name: Setup VitaSDK
         run: |
-          chmod +x scripts/psvita_sdk.sh
           scripts/psvita_sdk.sh
           echo "VITASDK=/usr/local/vitasdk" >> $GITHUB_ENV
           echo "$VITASDK/bin" >> $GITHUB_PATH
-      - name: Create build environment
-        run: cmake -E make_directory ${{github.workspace}}/build
       - name: Configure CMake
-        working-directory: build
-        run: cmake .. --preset "psvita-release"
-      - name: Build
-        working-directory: build
-        run: cmake --build . --parallel $(nproc)
+        run: cmake --preset "psvita-release"
       - name: Generate configuration files
         working-directory: build
-        run: |
-          chmod +x ${{ github.workspace }}/scripts/psvita_generate_configs.sh
-          ${{ github.workspace }}/scripts/psvita_generate_configs.sh
-      - name: Package
-        run: cpack --config CPackConfig.cmake
+        run: ${{ github.workspace }}/scripts/psvita_generate_configs.sh
+      - name: Build and Package
         working-directory: build
+        run: |
+          cmake --build . --parallel $(nproc)
+          cpack --config CPackConfig.cmake
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -94,25 +77,20 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: recursive
       - name: Setup Visual Studio
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: ${{ matrix.arch }}
-      - name: Configure project
+      - name: Configure
         run: cmake --preset "win32-ci-${{ matrix.arch }}"
-      - name: Run appversion.sh
-        run: regamedll/version/appversion.sh "${{ github.workspace }}/3rdparty/ReGameDLL_CS"
-        shell: bash
-        working-directory: 3rdparty/ReGameDLL_CS
-      - name: Build
-        run: cmake --build .
-        working-directory: build
-      - name: Package
-        run: cpack --config CPackConfig.cmake
+      - name: Build and Package
+        run: |
+          cmake --build .
+          cpack --config CPackConfig.cmake
         working-directory: build
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -137,15 +115,14 @@ jobs:
           sudo dpkg --add-architecture i386
           sudo apt-get update
           sudo apt-get install libatomic1:i386 libgcc-s1:i386 \
-            libstdc++6:i386 gcc-multilib g++-multilib cmake \
+            libstdc++6:i386 gcc-multilib g++-multilib \
             ninja-build libfontconfig-dev:i386 libfontconfig-dev
-      - name: Configure project
+      - name: Configure
         run: cmake --preset "linux-ci-${{ matrix.arch }}"
-      - name: Build
-        run: cmake --build .
-        working-directory: build
-      - name: Package
-        run: cpack --config CPackConfig.cmake
+      - name: Build and Package
+        run: |
+          cmake --build .
+          cpack --config CPackConfig.cmake
         working-directory: build
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -155,38 +132,23 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
     needs: [android, windows, linux, psvita]
     steps:
       - name: Fetch artifacts
         uses: actions/download-artifact@v4
       - name: Remove old release
-        uses: ClementTsang/delete-tag-and-release@v0.3.1
+        run: |
+          TAG_NAME=${{ github.ref_name == 'main' && 'continuous' || format('continuous-{0}', github.ref_name) }}
+          echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
+          if gh release list | grep -q -e "$TAG_NAME"; then
+            gh release delete "$TAG_NAME" --yes --cleanup-tag --repo ${{ github.repository }}
+          fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: continuous
-          delete_release: true
-          repo: ${{ env.GITHUB_REPOSITORY }}
-      - name: Prepare release
-        run: |
-          mv Android/app-ci-unsigned-signed.apk CS16Client-Android.apk
-
-          mv */*.zip .
-          mv */*.tar.gz .
-
-          sleep 60s
-      # - name: Purge artifacts
-      #   uses: geekyeggo/delete-artifact@v2
-      #   with:
-      #     name: "*"
       - name: Upload new release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_name: ${{ env.GITHUB_REPOSITORY }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file_glob: true
-          file: CS16Client-*
-          tag: continuous
-          overwrite: true
-          prerelease: true
-          release_name: CS16Client development build
+        run: |
+          gh release create ${{ env.TAG_NAME }} --title "CS16Client development build" --prerelease */CS16Client-* \
+            --repo ${{ github.repository }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -43,8 +43,7 @@
 *.ilk
 *.autosave
 
-android/pak/
-android/assets/extras.pak
+android/app/src/main/assets
 *-build
 *admob-id.xml
 

3rdparty/ReGameDLL_CS

@@ -1,12 +1,20 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(cs16-client)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
-set(EXTRAS_DIR "${CMAKE_CURRENT_BINARY_DIR}/extras")
 
 include(LibraryNaming)
 # include(ExternalProject)
 
+# for extras packaging
+find_package(Python COMPONENTS Interpreter REQUIRED)
+
+if (Python_FOUND)
+	message(STATUS "Python interpreter found: ${Python_EXECUTABLE}")
+else()
+	message(FATAL_ERROR "Python not found. Please install Python.")
+endif()
+
 option(BUILD_CLIENT "Build client library." ON)
 option(BUILD_MAINUI "Build menu library." ON)
 option(BUILD_SERVER "Build server library." ON)
@@ -60,7 +68,65 @@ if(BUILD_MAINUI)
 	add_subdirectory(3rdparty/mainui_cpp)
 endif()
 
-include(GenerateExtras)
+set(GRAPHS_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/graphs")
+
+execute_process(
+	COMMAND ${Python_EXECUTABLE}
+	${CMAKE_CURRENT_SOURCE_DIR}/scripts/yapb_graph_dl.py
+	${GRAPHS_OUTPUT}/addons/yapb/data/graph
+)
+
+set(EXTRAS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/cs16client-extras")
+set(YAPB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/yapb/cfg")
+
+if(ANDROID)
+	set(EXTRAS_OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/android/app/src/main/assets")
+
+	file(GLOB EXTRAS_FILES "${EXTRAS_DIR}/*")
+	file(GLOB YAPB_FILES "${YAPB_DIR}/*" "${GRAPHS_OUTPUT}/*")
+
+	file(REMOVE_RECURSE ${EXTRAS_OUTPUT})
+	file(
+		COPY ${EXTRAS_FILES} ${YAPB_FILES}
+		DESTINATION ${EXTRAS_OUTPUT}
+	)
+else()
+	set(EXTRAS_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/extras.pk3")
+
+	execute_process(
+		COMMAND ${Python_EXECUTABLE}
+		${CMAKE_CURRENT_SOURCE_DIR}/scripts/pack_extras.py
+		${EXTRAS_OUTPUT}
+		${EXTRAS_DIR}
+		${YAPB_DIR}
+		${GRAPHS_OUTPUT}
+	)
+
+	add_custom_target(generate_extras ALL
+		DEPENDS ${GRAPHS_OUTPUT} ${EXTRAS_OUTPUT}
+	)
+
+	install(
+		FILES "${EXTRAS_OUTPUT}"
+		DESTINATION ${GAME_DIR}
+	)
+endif()
+
+if(VITA)
+	install(
+		FILES
+		"${CMAKE_CURRENT_BINARY_DIR}/config.cfg"
+		"${CMAKE_CURRENT_BINARY_DIR}/video.cfg"
+		"${CMAKE_CURRENT_BINARY_DIR}/opengl.cfg"
+		DESTINATION "${GAME_DIR}/"
+	)
+
+	install(
+		FILES
+		"${CMAKE_CURRENT_BINARY_DIR}/kb_def.lst"
+		DESTINATION "${GAME_DIR}/gfx/shell"
+	)
+endif()
 
 if(WIN32)
 	set(CPACK_GENERATOR "ZIP")