diff --git a/.github/workflows/auto-doxygen.yml b/.github/workflows/auto-doxygen.yml index 2b1d48e12..6ddf6bbe8 100644 --- a/.github/workflows/auto-doxygen.yml +++ b/.github/workflows/auto-doxygen.yml @@ -3,9 +3,7 @@ on: push: branches: - master - pull_request: - branches: - - main + jobs: @@ -27,12 +25,25 @@ jobs: git lfs track "*.qch" - name: Run doxygen run: doxygen Doxyfile - - run: | - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git add .gitattributes ${{ github.workspace }}/doc/QElectroTech.qch -f - git commit -m "Push updated QCH file" - git push + - name: Create Pull Request + uses: peter-evans/create-pull-request@v8 + with: + token: ${{ secrets.MR_TOKEN }} + commit-message: update QCH file + committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> + title: Update QCH Help file + body: | + - Updating QT Help file following commit ${{ github.sha }}. + - Auto-generated by [create-pull-request][1] + + [1]: https://github.com/peter-evans/create-pull-request + branch: update-qch + base: doxygen-MR + labels: | + qch + cicd + delete-branch: true + add-paths: doc/*.qch - uses: actions/upload-pages-artifact@v3 with: path: ${{ github.workspace }}/doc/html/ diff --git a/.gitignore b/.gitignore index 3d74f09a2..1674ac4f1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,6 @@ # Qt build output *.user # doxygen Doxyfile output -doc/ +doc/* +!doc/QElectroTech.qch QElectroTech.tag diff --git a/Doxyfile b/Doxyfile index a3739f321..218c2ad47 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1638,7 +1638,7 @@ QHP_SECT_FILTER_ATTRS = # run qhelpgenerator on the generated .qhp file. # This tag requires that the tag GENERATE_QHP is set to YES. -QHG_LOCATION = /usr/lib/x86_64-linux-gnu/qt5/bin/qhelpgenerator +QHG_LOCATION = qhelpgenerator # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be # generated, together with the HTML files, they form an Eclipse help plugin. To