Develop (#5)

* added actions (#3)

* added cpack

* does not need multimedia on wasm

* added the keystore

* center position is now on top

* added subdir for client

* use kdap openssl

.github/release.yml

@@ -0,0 +1,22 @@
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+    authors:
+      - octocat
+  categories:
+    - title: Breaking Changes
+      labels:
+        - Semver-Major
+        - breaking-change
+    - title: Exciting New Features
+      labels:
+        - Semver-Minor
+        - enhancement
+    - title: Bug Fixing  
+      labels:
+        - Semver-Patch
+        - bug
+    - title: Other Changes
+      labels:
+        - "*"

.github/workflows/build-test-install.yml

@@ -0,0 +1,61 @@
+name: push-build-release
+run-name: ${{ github.actor }} ${{ github.event_name }} to ${{ github.base_ref }} 
+on: 
+
+  push:
+    tags:
+      - 'v*'
+  pull_request:
+    branches: [develop]
+jobs:
+  build_test_package:
+    strategy:
+      matrix:
+        os: [ubuntu-latest,macos-latest,windows-latest]
+
+    uses: EddyTheCo/Common/.github/workflows/[email protected]
+    permissions:
+      contents: write
+    with:
+      os: ${{ matrix.os }}
+      cmakeArgs: ' -DUSE_THREADS=ON -DQTDEPLOY=ON'  
+      qtModules: 'qtwebsockets qtshadertools qtmultimedia qtlocation qtpositioning'
+      qtVersion: '6.6.0'  
+      test: false
+  build-android:
+    strategy:
+      matrix:
+        qtArch: ['android_arm64_v8a','android_armv7']  
+
+    uses: EddyTheCo/Common/.github/workflows/build-android.yml@android_subdirectory
+    with:
+      qtModules: 'qtwebsockets qtshadertools qtmultimedia qtlocation qtpositioning'
+      qtTarget: 'lockersClient'
+      qtVersion: '6.6.0'  
+      cmakeArgs: '-DUSE_THREADS=ON -DBUILD_SERVER=OFF'  
+      qtArch: ${{ matrix.qtArch }}
+      subdir: 'Client'
+    secrets:
+      QT_ANDROID_KEYSTORE_STORE_PASS:  ${{ secrets.QT_ANDROID_KEYSTORE_STORE_PASS }}
+  release:
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs: [build_test_package,build-android]
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    steps:
+
+      - uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v4
+        with:
+           path: artifacts
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: Releases 
+        uses: softprops/action-gh-release@v1
+        with:
+          files: ./artifacts/*/*       

.github/workflows/build-wasm.yaml

@@ -0,0 +1,59 @@
+name: build-wasm
+run-name: ${{ github.actor }} ${{ github.event_name }} to ${{ github.base_ref }} 
+on:
+  pull_request:
+    branches: [main,develop]
+  pull_request_target:
+    types: [closed]
+    branches: [main]
+jobs:
+  build-html:
+    uses: EddyTheCo/Common/.github/workflows/[email protected]
+    permissions:
+      pages: write
+      id-token: write
+    with:
+      qtModules: 'qtwebsockets qtshadertools '
+      qtVersion: '6.6.0'
+      emsdkVersion: '3.1.37'
+      deploy_dev: ${{ (github.event.pull_request.merged == false)&&(startsWith(github.base_ref, 'main'))&&(startsWith(github.head_ref, 'develop')) }}
+  deploy_wasm:
+    needs: build-html
+    if: ${{ (startsWith(github.base_ref, 'main'))&&(startsWith(github.head_ref, 'develop')) }}
+
+    runs-on: 'ubuntu-latest'
+    permissions:
+      pages: write
+      id-token: write
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+
+  release:
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs: build-html
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    steps:
+
+      - uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: Releases
+        uses: softprops/action-gh-release@v1
+        with:
+          files: ./artifacts/*/*

CMakeLists.txt

@@ -56,3 +56,12 @@ endif(BUILD_CLIENT)
 if(BUILD_SERVER)
 	add_subdirectory(Server)
 endif(BUILD_SERVER)
+
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    set(CPACK_PACKAGE_CONTACT "estervtech")
+    set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-v${SEMVER}-${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_VERSION}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_CXX_COMPILER_ID}")
+    if(USE_THREADS)
+        set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-MThread")
+    endif(USE_THREADS)
+    include(CPack)
+endif()

Client/CMakeLists.txt

@@ -18,7 +18,7 @@ endif()
 
 
 if(EMSCRIPTEN OR ANDROID)
-    find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Qml Multimedia QuickControls2)
+    find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Qml  QuickControls2)
     find_package(EstervDesigns 1.1 REQUIRED COMPONENTS FlatControl CONFIG )
 endif(EMSCRIPTEN OR ANDROID)
 
@@ -64,6 +64,19 @@ if(ANDROID)
     set_property(TARGET lockersClient APPEND PROPERTY QT_ANDROID_MIN_SDK_VERSION 30)
     set_property(TARGET lockersClient APPEND PROPERTY QT_ANDROID_TARGET_SDK_VERSION 34)
     set_property(TARGET lockersClient APPEND PROPERTY QT_ANDROID_SDK_BUILD_TOOLS_REVISION 34.0.0)
+
+    FetchContent_Declare(
+        android_openssl
+        DOWNLOAD_EXTRACT_TIMESTAMP true
+        URL      https://github.com/KDAB/android_openssl/archive/refs/heads/master.zip
+    )
+FetchContent_GetProperties(android_openssl)
+if(NOT android_openssl_POPULATED)
+    FetchContent_Populate(android_openssl)
+    include(${android_openssl_SOURCE_DIR}/android_openssl.cmake)
+    add_android_openssl_libraries(lockersClient)
+endif(NOT android_openssl_POPULATED)
+
 endif(ANDROID)
 endif(EMSCRIPTEN OR ANDROID)