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

use sdk26 and qt 6.8 #83

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
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
13 changes: 13 additions & 0 deletions .github/workflows/code-format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: code-format
run-name: Format code and do PR
on:
pull_request_target:
types: [closed]
branches: [develop]
jobs:
checkout-format-pr:
uses: EddyTheCo/Common/.github/workflows/code-format.yml@ndk26
if: ${{ (github.event.pull_request.merged == true) && (startsWith(github.base_ref, 'develop')) }}
permissions:
contents: write
pull-requests: write
50 changes: 0 additions & 50 deletions .github/workflows/codeFormat.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: push-build-release
run-name: ${{ github.actor }} ${{ github.event_name }} to ${{ github.base_ref }}
on:
run-name: ${{ github.actor }} ${{ github.event_name }} to ${{ github.base_ref }}
on:

push:
tags:
Expand All @@ -13,35 +13,33 @@ jobs:
matrix:
os: [ubuntu-latest,macos-latest,windows-latest]

uses: EddyTheCo/Common/.github/workflows/build-test-install.yml@v0.4.1
uses: EddyTheCo/Common/.github/workflows/build-test-install.yml@v0.5.0
with:
os: ${{ matrix.os }}
cmakeArgs: ' -DUSE_THREADS=ON -DQTDEPLOY=ON [email protected] -DREPO_URL=https://eddytheco.github.io/Esterv.Crypto.NFTWallet -DCPACK_PACKAGE_VENDOR=estervtech'
qtModules: 'qtwebsockets qtshadertools qtmultimedia'
qtVersion: '6.6.0'
test: false
qtVersion: '6.8.1'
build-android:
strategy:
matrix:
qtArch: ['android_arm64_v8a','android_armv7']
qtArch: ['android_arm64_v8a','android_armv7']

uses: EddyTheCo/Common/.github/workflows/build-android.yml@v0.4.1
uses: EddyTheCo/Common/.github/workflows/build-android.yml@v0.5.0
with:
qtModules: 'qtwebsockets qtshadertools qtmultimedia'
qtTarget: 'nftwallet'
qtVersion: '6.6.0'
cmakeArgs: ' -DUSE_THREADS=ON '
qtArch: ${{ matrix.qtArch }}
qtVersion: '6.8.1'
cmakeArgs: ' -DUSE_THREADS=ON '
qtArch: ${{ matrix.qtArch }}
secrets:
QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.QT_ANDROID_KEYSTORE_STORE_PASS }}
build-wasm:
uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@v0.4.1
uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@v0.5.0
with:
qtModules: 'qtwebsockets qtshadertools'
qtVersion: '6.6.0'
emsdkVersion: '3.1.37'
deploy_dev: ${{ (startsWith(github.base_ref, 'main'))&&(startsWith(github.head_ref, 'develop')) }}

release-deploy:
if: ${{ ((startsWith(github.base_ref, 'main'))&&(startsWith(github.head_ref, 'develop')))||(startsWith(github.ref, 'refs/tags/v')) }}
needs: [build_test_package,build-android,build-wasm]
Expand All @@ -57,13 +55,13 @@ jobs:
url: ${{ steps.deployment.outputs.page_url }}

steps:

- uses: actions/checkout@v4

- uses: actions/download-artifact@v4
with:
path: artifacts

- name: Display structure of downloaded files
run: ls -R

Expand All @@ -76,7 +74,7 @@ jobs:
mkdir github-pages/packages/ ${{runner.temp}}/platforms/
mv artifacts/*/_CPack_Packages/* ${{runner.temp}}/platforms/
for i in ${{runner.temp}}/platforms/*; do mv $i/IFW/*/repository/* $i/; rm -rf $i/IFW $i/TGZ; done;
mv ${{runner.temp}}/platforms/* github-pages/packages/
mv ${{runner.temp}}/platforms/* github-pages/packages/
rm -rf artifacts/*/_CPack_Packages

- name: Package github-page
Expand All @@ -89,11 +87,11 @@ jobs:
if: startsWith(github.ref, 'refs/tags/v')
uses: softprops/action-gh-release@v1
with:
files: ./artifacts/*/*
files: ./artifacts/*/*

- uses: actions/upload-artifact@v4
with:
name: 'github-pages'
name: 'github-pages'
path: ${{runner.temp}}/page-packages/*

- name: Deploy to GitHub Pages
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: 'Download artifact'
uses: actions/download-artifact@v4
with:
name: qmllint
name: common
github-token: ${{ secrets.GITHUB_TOKEN }}
run-id: ${{ github.event.workflow_run.id }}

Expand Down
20 changes: 10 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include(FetchContent)
FetchContent_Declare(
ccommon
GIT_REPOSITORY https://github.com/EddyTheCo/Common.git
GIT_TAG v0.4.1)
GIT_TAG v0.5.0)
FetchContent_MakeAvailable(ccommon)
version_from_git(LOG OFF TIMESTAMP "%Y%m%d%H%M%S")
project(
Expand All @@ -30,12 +30,12 @@ find_package(
FetchContent_Declare(
EstervDesigns
GIT_REPOSITORY https://github.com/EddyTheCo/Esterv.Designs.git
GIT_TAG improve
GIT_TAG v2.0.0
FIND_PACKAGE_ARGS
1.2
2
COMPONENTS
EstervSimpleStyle
EstervCustomControls
SimpleStyle
CustomControls
EstervAbout${CMAKE_PROJECT_NAME}
CONFIG)
FetchContent_MakeAvailable(EstervDesigns)
Expand All @@ -48,18 +48,18 @@ FetchContent_Declare(
FetchContent_MakeAvailable(IotaWallet)

FetchContent_Declare(
qrCode
EstervQrCode
GIT_REPOSITORY https://github.com/EddyTheCo/qrCode.git
GIT_TAG use_latest
FIND_PACKAGE_ARGS 1.1 COMPONENTS EstervQtQrDec EstervQtQrGen CONFIG)
FetchContent_MakeAvailable(qrCode)
GIT_TAG develop
FIND_PACKAGE_ARGS 2 COMPONENTS QtQrDec QtQrGen CONFIG)
FetchContent_MakeAvailable(EstervQrCode)

FetchContent_Declare(
EstervDTPickers
GIT_REPOSITORY
https://github.com/EddyTheCo/Esterv.CustomControls.DateTimePickers.git
GIT_TAG develop
FIND_PACKAGE_ARGS 0.2 CONFIG)
FIND_PACKAGE_ARGS 1 CONFIG)
FetchContent_MakeAvailable(EstervDTPickers)

if(EMSCRIPTEN OR ANDROID)
Expand Down
157 changes: 157 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
{
"version": 6,
"configurePresets": [
{
"name": "default-release",
"displayName": "Default Release",
"description": "Release configuration",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/release",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"REPO_URL": "https://eddytheco.github.io/Esterv.Crypto.NFTWallet"
}
},
{
"name": "default-develop",
"displayName": "Default Config for development(Release)",
"description": "Release build type using Ninja generator, add tests and docs",
"inherits": "default-release",
"cacheVariables": {
"BUILD_DOCS": "ON"
}
},
{
"name": "default-develop-debug",
"displayName": "Default Config for development(Debug)",
"description": "Debug build type using Ninja generator",
"inherits": "default-develop",
"binaryDir": "${sourceDir}/build/debug",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
}
],
"buildPresets": [
{
"name": "default-release",
"configurePreset": "default-release"
},
{
"name": "default-develop",
"configurePreset": "default-develop"
},
{
"name": "default-develop-debug",
"configurePreset": "default-develop-debug"
},
{
"name": "default-documentation",
"configurePreset": "default-develop",
"targets": "doxygen_docs"
},
{
"name": "default-qmllint",
"configurePreset": "default-develop",
"targets": "all_qmllint_json"
}
],
"workflowPresets": [
{
"name": "default-release",
"steps": [
{
"type": "configure",
"name": "default-release"
},
{
"type": "build",
"name": "default-release"
}
]
},
{
"name": "default-develop",
"steps": [
{
"type": "configure",
"name": "default-develop"
},
{
"type": "build",
"name": "default-develop"
}
]
},
{
"name": "default-documentation",
"steps": [
{
"type": "configure",
"name": "default-develop"
},
{
"type": "build",
"name": "default-documentation"
}
]
},
{
"name": "default-qmllint",
"steps": [
{
"type": "configure",
"name": "default-develop"
},
{
"type": "build",
"name": "default-qmllint"
}
]
},
{
"name": "default-develop-debug",
"steps": [
{
"type": "configure",
"name": "default-develop-debug"
},
{
"type": "build",
"name": "default-develop-debug"
}
]
}
],
"packagePresets": [
{
"name": "default-release",
"description": "Release runtime components",
"configurePreset": "default-release",
"generators": [
"IFW",
"TGZ"
],
"variables": {
"CPACK_PACKAGE_CONTACT": "[email protected]",
"CPACK_PACKAGE_VENDOR": "estervtech"
},
"packageDirectory": "packages"
},
{
"name": "default-develop",
"description": "Release development components",
"configurePreset": "default-develop",
"generators": [
"IFW",
"TGZ"
],
"variables": {
"CPACK_COMPONENTS_GROUPING": "ALL_COMPONENTS_IN_ONE",
"CPACK_PACKAGE_CONTACT": "[email protected]",
"CPACK_PACKAGE_VENDOR": "estervtech"
},
"packageDirectory": "packages-dev"
}
]
}
Loading