CI: Update scripts

Author: tmp64

.github/workflows/ci.yml

@@ -13,37 +13,50 @@ jobs:
   build:
     strategy:
       matrix:
-        runs-on: [windows-2019, ubuntu-20.04]
+        os:
+          - runs-on: windows-2022
+            suffix: ci-windows
+          - runs-on: ubuntu-22.04
+            suffix: ci-linux
 
     # The type of runner that the job will run on
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ${{ matrix.os.runs-on }}
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3.3.0
         with:
           submodules: recursive
-      
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v4.5.0
-        with:
-          python-version: 3.8
-      
+          fetch-depth: 0 # Required for automatic versioning
+
       - name: Install Ubuntu packages
-        if: matrix.runs-on == 'ubuntu-20.04'
+        if: matrix.os.runs-on == 'ubuntu-22.04'
         run: |
           sudo dpkg --add-architecture i386
           sudo apt update || true
-          sudo apt install -y libc6:i386 ninja-build gcc-9-multilib g++-9-multilib libssl1.1:i386 libssl-dev:i386 zlib1g-dev:i386
+          sudo apt install -y libc6:i386 linux-libc-dev:i386 ninja-build gcc-multilib g++-multilib
 
       - name: Build release
         id: build
         run: |
-          python ./scripts/build_release.py --build-type release --vs 2019 --toolset v141_xp --linux-compiler gcc-9 --out-dir ./_build_out --cmake-args="-DWARNINGS_ARE_ERRORS=ON" --github-actions
+          cmake --preset github-actions
+          cmake --build --preset github-actions
+          cmake --install ${{github.workspace}}/_build/github-actions --config RelWithDebInfo --prefix ${{github.workspace}}/_build/ci-install
+
+      # Prepare artifact
+      - name: Prepare artifact
+        id: prepare_artifact
+        run: >
+          python scripts/package_target.py
+          --build-dir ${{github.workspace}}/_build/github-actions
+          --install-dir ${{github.workspace}}/_build/ci-install
+          --artifact-dir ${{github.workspace}}/_build/ci-artifact
+          --suffix ${{ matrix.os.suffix }}
 
+      # Upload result
       - name: Upload build result
-        uses: actions/upload-artifact@v4.6.0
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.build.outputs.artifact_name }}
-          path: ./_build_out/WeaponMod-*.zip
+          name: ${{ steps.prepare_artifact.outputs.artifact_name }}
+          path: ${{github.workspace}}/_build/ci-artifact

CMakeLists.txt

@@ -17,6 +17,11 @@ include(InputFilesList)
 include(WinXPSupport)
 include(GitVersionSemverfier)
 
+# This will be used by CI build scripts
+file( WRITE ${CMAKE_BINARY_DIR}/version.txt ${GIT_SEM_VERSION} )
+
+message( "Version: ${GIT_SEM_VERSION} (from Git)" )
+
 project( WeaponMod VERSION "${GIT_MAJOR}.${GIT_MINOR}.${GIT_PATCH}" )
 include( PlatformInfo )
 

CMakePresets.json

@@ -22,8 +22,7 @@
     },
     {
       "name": "github-actions",
-      "inherits": ["base"],
-      "generator": "Ninja Multi-Config",
+      "inherits": ["platform-generator", "base"],
       "cacheVariables": {
         "GNU_FORCE_COLORED_OUTPUT": false,
         "WARNINGS_ARE_ERRORS": true

cmake/GitVersionSemverfier.cmake

@@ -42,6 +42,9 @@ if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
                     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                     OUTPUT_VARIABLE GIT_HASH
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
+    # Replace slash in Git branch name
+    string( REPLACE "/" "-" GIT_BRANCH ${GIT_BRANCH} )
+
     if(NOT _git_code EQUAL 128)
         string(REGEX MATCH "(.*)-([0-9]+)-g(.+)" _git_result "${_git_result}")
         set(GIT_TAG ${CMAKE_MATCH_1})
@@ -65,9 +68,10 @@ if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
     if(GIT_SKIP GREATER 0)
         math(EXPR GIT_MINOR "${GIT_MINOR} + 1" OUTPUT_FORMAT DECIMAL)
         string(REGEX REPLACE "(v[0-9]+\.)([0-9]+)(\.[0-9]+)(.*)" "\\1${GIT_MINOR}.0\\4" GIT_TAG "${GIT_TAG}")
-        set(GIT_SEM_VERSION "${GIT_TAG}${_git_delimiter}dev.${GIT_SKIP}+${GIT_HASH}.${GIT_BRANCH}")
+        set(GIT_SEM_VERSION "${GIT_TAG}${_git_delimiter}dev.${GIT_SKIP}+${GIT_BRANCH}.${GIT_HASH}")
+        set(GIT_PATCH 0)
     else()
-        set(GIT_SEM_VERSION "${GIT_TAG}+${GIT_HASH}.${GIT_BRANCH}")
+        set(GIT_SEM_VERSION "${GIT_TAG}+${GIT_BRANCH}.${GIT_HASH}")
     endif()
 
     execute_process(COMMAND "${GIT_EXECUTABLE}" diff-index --quiet HEAD --
@@ -77,6 +81,7 @@ if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
 		OUTPUT_STRIP_TRAILING_WHITESPACE)
     if(_git_dirty EQUAL 1)
         set(GIT_SEM_VERSION "${GIT_SEM_VERSION}.m")
+        message("Git working tree is dirty!")
     endif()
 
     #if(CMAKE_SCRIPT_MODE_FILE)
@@ -87,13 +92,13 @@ if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
     #endif()
 
     string(REGEX REPLACE "v(.*)" "\\1" GIT_SEM_VERSION "${GIT_SEM_VERSION}")
+    set(GIT_SUCCESS TRUE)
 else()
     set(GIT_MAJOR 0)
     set(GIT_MINOR 0)
     set(GIT_PATCH 0)
     set(GIT_SKIP 0)
     set(GIT_TAG "v0.0.0")
-    set(GIT_SEM_VERSION "0.0.0+0000000.error")
+    set(GIT_SEM_VERSION "0.0.0+error.0000000")
+    set(GIT_SUCCESS FALSE)
 endif()
-
-message("Version: ${GIT_SEM_VERSION}")