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

Develop #82

Open
wants to merge 2 commits into
base: main
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
10 changes: 5 additions & 5 deletions .github/workflows/build-test-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
matrix:
os: [ubuntu-latest,macos-latest,windows-latest]

uses: EddyTheCo/Common/.github/workflows/build-test-install.yml@v0.3.0
uses: EddyTheCo/Common/.github/workflows/build-test-install.yml@v0.4.1
with:
os: ${{ matrix.os }}
cmakeArgs: ' -DUSE_THREADS=ON -DQTDEPLOY=ON [email protected] -DREPO_URL=https://eddytheco.github.io/NftMinter -DCPACK_PACKAGE_VENDOR=estervtech'
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
Expand All @@ -25,17 +25,17 @@ jobs:
matrix:
qtArch: ['android_arm64_v8a','android_armv7']

uses: EddyTheCo/Common/.github/workflows/build-android.yml@v0.3.0
uses: EddyTheCo/Common/.github/workflows/build-android.yml@v0.4.1
with:
qtModules: 'qtwebsockets qtshadertools qtmultimedia'
qtTarget: 'nftminter'
qtTarget: 'nftwallet'
qtVersion: '6.6.0'
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.3.0
uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@v0.4.1
with:
qtModules: 'qtwebsockets qtshadertools'
qtVersion: '6.6.0'
Expand Down
50 changes: 50 additions & 0 deletions .github/workflows/codeFormat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: codeFormat
run-name: Format code and do PR
on:
pull_request_target:
types: [closed]
branches: [develop]
jobs:
checkout-format-pr:
runs-on: ubuntu-latest
if: ${{ (github.event.pull_request.merged == true) && (startsWith(github.base_ref, 'develop')) }}
permissions:
contents: write
pull-requests: write
steps:

- name: checkout
uses: actions/checkout@v4

- name: Install dependencies on ubuntu
run: |
sudo apt-get update
sudo apt-get install clang-format jq
pip install cmakelang

- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
aqtversion: '==3.1.*'
version: '6.6.0'
host: 'linux'
target: 'desktop'
arch: 'gcc_64'

- name: Format code
run: |
rm aqtinstall.log
find . -regex '.*\.\(cpp\|hpp\|cu\|cuh\|c\|h\)' -exec clang-format -style=file -i {} \;
find . -regex '.*\.\(qml\)' -exec qmlformat -i {} \;
find . -regex '.*\.\(cmake\)' -exec cmake-format -i {} \;
find . -name 'CMakeLists.txt' -exec cmake-format -i {} \;
find . -regex '.*\.\(json\)' -exec bash -c "jq . {} > {}.back; mv {}.back {} " \;

- name: Create Pull Request
uses: peter-evans/[email protected]
with:
commit-message: C/C++/QML formatted code
branch: formattedCode
author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
title: Fixed the format of your nice code
body: Every time you change the format, I am here to fix your mess.
35 changes: 35 additions & 0 deletions .github/workflows/qmllint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: qmllintbot
run-name: Linting QML for PR
on:

workflow_run:
workflows: [push-build-release]
types:
- completed
jobs:
download-comment:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
permissions:
actions: read
pull-requests: write
steps:
- name: 'Download artifact'
uses: actions/download-artifact@v4
with:
name: qmllint
github-token: ${{ secrets.GITHUB_TOKEN }}
run-id: ${{ github.event.workflow_run.id }}

- name: Read pr number
id: getprn
run: |
cat pr_number
echo "prn=$(cat pr_number)" >> $GITHUB_OUTPUT

- name: 'Run reviewer'
uses: EddyTheCo/qmllint-action/@v0.1.0
with:
jsondir: ${{ github.workspace }}
pr_number: ${{ steps.getprn.outputs.prn }}

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ doc/*.tag
*.swp
*.autosave
*.wasm
CMakeLists.txt.user
tags
qtloader.js
build*
Loading
Loading