Skip to content

Commit

Permalink
Add new codes and align naming
Browse files Browse the repository at this point in the history
* align naming of namespace and files

* add cmake presets

* use latest actions

* add codes 45, 51, 53, 55, 56, 57, 61, 63, 65, 66, 67

* allow all codes to be searched

* do not qt deploy if wasm or android
  • Loading branch information
EddyTheCo authored Jan 1, 2025
1 parent 76f1698 commit cb6e161
Show file tree
Hide file tree
Showing 40 changed files with 3,300 additions and 417 deletions.
44 changes: 17 additions & 27 deletions .github/workflows/build-test-install.yml
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.event.pull_request.base.ref }}
on:

push:
tags:
Expand All @@ -9,28 +9,19 @@ on:
branches: [develop]
jobs:
build_test_package:
permissions: read-all
strategy:
matrix:
os: [ubuntu-latest,macos-latest,windows-latest]
os: [ubuntu-latest,macos-latest,windows-latest]

uses: EddyTheCo/Common/.github/workflows/build-test-install.yml@v0.4.0
uses: EddyTheCo/Common/.github/workflows/build-test-install.yml@v0.5.1
with:
os: ${{ matrix.os }}
qtModules: 'qtshadertools'
qtVersion: '6.6.0'
cmakeArgs: " -DQTDEPLOY=ON -DBUILD_EXAMPLES=ON [email protected] -DREPO_URL=https://eddytheco.github.io/OMClient -DCPACK_PACKAGE_VENDOR=estervtech"
test: false
qmllint: ${{ startsWith(matrix.os, 'ubuntu') && startsWith(github.base_ref, 'develop') }}


build_doxygen:
if: startsWith(github.ref, 'refs/tags/v')
uses: EddyTheCo/Common/.github/workflows/[email protected]

qtVersion: '6.8.1'
qtModules: 'qtshadertools'

release:
if: startsWith(github.ref, 'refs/tags/v')
needs: [build_test_package, build_doxygen]
needs: build_test_package
runs-on: ubuntu-latest

permissions:
Expand All @@ -43,23 +34,21 @@ 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
path: artifacts

- name: Move repositories to webpage
run: |
mv artifacts/docs/html github-pages
rm -rf artifacts/docs
mv artifacts/common/html github-pages
mv artifacts/common .
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 @@ -68,10 +57,11 @@ jobs:
cmake -E make_directory ${{runner.temp}}/page-packages
cmake -E tar c ${{runner.temp}}/page-packages/github-pages.tar -- .
- name: Releases
uses: softprops/action-gh-release@v1
- name: Releases
uses: softprops/action-gh-release@v2
with:
files: ./artifacts/*/*
body_path: ./common/CHANGELOG.md

- uses: actions/upload-artifact@v4
with:
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/code-format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
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/[email protected]
if: ${{ (github.event.pull_request.merged == true) && (startsWith(github.base_ref, 'develop')) }}
permissions:
contents: write
pull-requests: write

46 changes: 0 additions & 46 deletions .github/workflows/codeFormat.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: lintbot
run-name: Linting for PR
name: qmllintbot
run-name: Linting QML for PR
on:

workflow_run:
Expand All @@ -9,15 +9,15 @@ on:
jobs:
download-comment:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }}
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
name: common
github-token: ${{ secrets.GITHUB_TOKEN }}
run-id: ${{ github.event.workflow_run.id }}

Expand All @@ -28,7 +28,8 @@ jobs:
echo "prn=$(cat pr_number)" >> $GITHUB_OUTPUT
- name: 'Run reviewer'
uses: EddyTheCo/qmllint-action/@main
uses: EddyTheCo/qmllint-action/@v0.1.0
with:
jsondir: ${{ github.workspace }}
pr_number: ${{ steps.getprn.outputs.prn }}

5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@ doc/html/
doc/*.tag
*.swp
*.autosave
*.wasm
CMakeLists.txt.user
CMakeUserPresets.json
tags
build*
Loading

0 comments on commit cb6e161

Please sign in to comment.