Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added actions #3

Merged
merged 8 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -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:
- "*"
61 changes: 61 additions & 0 deletions .github/workflows/build-test-install.yml
Original file line number Diff line number Diff line change
@@ -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/*/*
59 changes: 59 additions & 0 deletions .github/workflows/build-wasm.yaml
Original file line number Diff line number Diff line change
@@ -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/*/*
9 changes: 9 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
15 changes: 14 additions & 1 deletion Client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Client/ServerMap/qml/ObjectMapView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ MapView {
height:56
radius: 56
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.top: parent.top
anchors.margins: 10
visible: LocationPermisioner.isGranted
ToolTip.text: qsTr("Recenter")
Expand Down
Binary file added Client/android/android_release.keystore
Binary file not shown.
Loading
Loading