fix CI actions for Linux (#193)

* fix : run on ubuntu 22.04 to fix 'awaiting for runner' CI issue

* fix : vcpkg path must match submodule path hardcoded from CMakePresets

* fix : use upload-artifact v4 as v3 is deprecated

* fix missing wslay include in Linux CI builds
Fixes missing <wslay/wslay.h> during library compilation on Linux Ubuntu.

* update : use integrationtest/ instead of client-testrunner repo

* fix test compilation : include thread lib

* upd : use Task to run tests

Author: upwelling-twll

.github/actions/build-library-and-upload/action.yml

@@ -68,15 +68,15 @@ runs:
       if: runner.os == 'Windows'
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ steps.get-folder-name-unix.outputs.folder-name }}
         path: ${{ steps.create-zip-unix.outputs.artifact-path }}
         if-no-files-found: error
       if: runner.os != 'Windows'
 
     - name: Upload artifact (Windows)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ steps.get-folder-name-windows.outputs.folder-name }}-${{ inputs.build-type }}
         path: ${{ steps.create-zip-windows.outputs.artifact-path }}

.github/actions/build-test-and-run/action.yml

@@ -7,9 +7,6 @@ inputs:
   nakama-cpp-path:
     description: 'Relative path under $GITHUB_WORKSPACE to the nakama-cpp repository'
     required: true
-  testrunner-pat:
-    description: 'PAT to access the private Nakama testrunner'
-    required: true
   build-type:
     description: The build type.
     required: true
@@ -20,20 +17,11 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Checkout nakama-client-testrunner
-      uses: actions/checkout@v2
-      with:
-        repository: heroiclabs/nakama-client-testrunner
-        token: ${{ inputs.testrunner-pat }}
-        path: nakama-client-testrunner
-    - name: Start docker containers for nakama-client-testrunner
-      run: |
-        docker-compose up -d
-      working-directory: nakama-client-testrunner
+    - name: Install Task
       shell: bash
-    - id: build
-      run: |
-        cmake --preset ${{ inputs.preset }} -DBUILD_SHARED_NAKAMA_SDK=ON
-        cmake --build ./build/${{ inputs.preset }} --config ${{ inputs.build-type }} --target install run -- ${{ inputs.native-tool-options }}
+      run: npm install -g @go-task/cli
+
+    - name: Run tests with Task
       shell: bash
-      working-directory: ${{ inputs.nakama-cpp-path }}/test
+      run: task test
+      working-directory: ${{ inputs.nakama-cpp-path }}

.github/actions/handle-failure/action.yml

@@ -65,7 +65,7 @@ runs:
           Pop-Location
         }
       shell: powershell
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: ${{ steps.build.outputs.artifact_name }}-workdir-debug
         path: |

.github/actions/setup-ubuntu/action.yml

@@ -3,17 +3,23 @@ description: 'Sets up prereqs for all ubuntu machines'
 runs:
   using: "composite"
   steps:
-    - run: |
-        install_ninja() {
-          (
-            mkdir -p ~/bin
-            cd /tmp
-            curl -L -O https://github.com/ninja-build/ninja/releases/download/v1.11.0/ninja-linux.zip
-            unzip ninja-linux.zip
-            mv ninja /usr/local/bin/
-          )
-          ninja --version 2>/dev/null
-        }
+    - name: Install Ubuntu dependencies
+      shell: bash
+      run: |
+        set -euo pipefail
+        sudo apt-get update
+        sudo apt-get install -y \
+          cmake \
+          ninja-build \
+          libcurl4-openssl-dev \
+          gcc \
+          g++
+
+    - name: Ensure ninja + mono available
+      shell: bash
+      run: |
+        set -euo pipefail   
+        mkdir -p ~/bin
 
         # vcpkg wants mono, make sure it finds one
         # see: https://github.com/microsoft/vcpkg/issues/25585
@@ -28,5 +34,4 @@ runs:
 
         ninja --version 2>/dev/null || install_ninja
         ensure_mono
-      shell: bash
 

.github/workflows/build_linux.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         build-type: [MinSizeRel]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -15,7 +15,7 @@ jobs:
       - uses: ./nakama-cpp/.github/actions/setup-vcpkg
         with:
           github_token: ${{ secrets.github_token }}
-          vcpkg-path: vcpkg
+          vcpkg-path: nakama-cpp/submodules/vcpkg
       - uses: ./nakama-cpp/.github/actions/build-library-and-upload
         with:
           nakama-cpp-path: nakama-cpp
@@ -25,4 +25,4 @@ jobs:
         uses: ./nakama-cpp/.github/actions/handle-failure
         with:
           nakama-cpp-path: nakama-cpp
-          vcpkg-path: vcpkg
+          vcpkg-path: nakama-cpp/submodules/vcpkg

.github/workflows/test_linux.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         build-type: [MinSizeRel]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -15,7 +15,7 @@ jobs:
       - uses: ./nakama-cpp/.github/actions/setup-vcpkg
         with:
           github_token: ${{ secrets.github_token }}
-          vcpkg-path: vcpkg
+          vcpkg-path: nakama-cpp/submodules/vcpkg
       - uses: ./nakama-cpp/.github/actions/build-library-and-upload
         with:
           nakama-cpp-path: nakama-cpp
@@ -25,10 +25,9 @@ jobs:
         with:
           nakama-cpp-path: nakama-cpp
           preset: linux-amd64
-          testrunner-pat: ${{ secrets.GH_PAT }}
           build-type: ${{ matrix.build-type }}
       - if: failure()
         uses: ./nakama-cpp/.github/actions/handle-failure
         with:
           nakama-cpp-path: nakama-cpp
-          vcpkg-path: vcpkg
+          vcpkg-path: nakama-cpp/submodules/vcpkg

.github/workflows/test_osx.yml

@@ -57,7 +57,6 @@ jobs:
           with:
             nakama-cpp-path: nakama-cpp
             preset: ${{ matrix.preset }}
-            testrunner-pat: ${{ secrets.GH_PAT }}
             native-tool-options: "-allowProvisioningUpdates"
             build-type: ${{ matrix.build-type }}
         - if: failure()

.github/workflows/test_windows.yml

@@ -25,7 +25,6 @@ jobs:
           with:
             nakama-cpp-path: nakama-cpp
             preset: ${{ matrix.preset }}
-            testrunner-pat: ${{ secrets.GH_PAT }}
             build-type: ${{ matrix.build-type }}
         - if: failure()
           uses: ./nakama-cpp/.github/actions/handle-failure

impl/wsWslay/CMakeLists.txt

@@ -14,6 +14,7 @@ target_link_libraries(nakama-impl-ws-wslay
         nakama::sdk-interface
         PRIVATE
         nakama::sdk-core-common nakama::sdk-core-misc wslay
+        INTERFACE wslay
 )
 
 target_include_directories(nakama-impl-ws-wslay

satori-cpp/test/main.cpp

@@ -15,6 +15,7 @@
  */
 
 #include <iostream>
+#include <thread>
 
 #include "nakama-cpp/satori/SatoriClientFactory.h"