From 1ef7ac2654a4676e1968cd5203ca1799ae99337d Mon Sep 17 00:00:00 2001 From: Cameron Trow Date: Tue, 21 Sep 2021 00:06:37 +0100 Subject: [PATCH 1/8] Update Doxygen.yml --- .github/workflows/Doxygen.yml | 37 +++++++++++++++-------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/.github/workflows/Doxygen.yml b/.github/workflows/Doxygen.yml index 0b1ec959..1dd373b1 100644 --- a/.github/workflows/Doxygen.yml +++ b/.github/workflows/Doxygen.yml @@ -10,11 +10,6 @@ jobs: Doxygen: runs-on: ubuntu-latest steps: - - name: Configure GPG Key - run: | - echo -n "$PPA_KEY" | base64 --decode | gpg --import - env: - PPA_KEY: ${{ secrets.PPA_KEY }} - name: Checkout Branch uses: actions/checkout@v2-beta # use either @v2-beta or @master. Eventually there will be a @v2 tag. - name: Prepare docs @@ -25,21 +20,21 @@ jobs: with: doxyfile-path: "doxygen/doxyfile" - name: Deploy - run: | - cp -r doxygen-out/html/* docs + #run: |0 - - name: commit - continue-on-error: true - run: | - git config --global user.email "tumblegmaer@gmail.com" - git config --global user.name "Github Actions" - git add . - git commit -m "docs update" - git push - exit 0 + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GH_KEY }} + publish_dir: ./build/docs/html + enable_jekyll: true + #cp -r doxygen-out/html/* docs - # uses: peaceiris/actions-gh-pages@v3 - # with: - # github_token: ${{ secrets.GITHUB_TOKEN }} - # publish_dir: ./build/docs/html - # enable_jekyll: true +# - name: commit +# continue-on-error: true +# run: | +# git config --global user.email "tumblegmaer@gmail.com" +# git config --global user.name "Github Actions" +# git add . +# git commit -m "docs update" +# git push +# exit From 23019279988fee68ac66fc90331a24fc4b0987e5 Mon Sep 17 00:00:00 2001 From: Tumble Date: Tue, 21 Sep 2021 00:10:51 +0100 Subject: [PATCH 2/8] setup --- .github/workflows/Doxygen.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/Doxygen.yml b/.github/workflows/Doxygen.yml index 1dd373b1..e6b2bf24 100644 --- a/.github/workflows/Doxygen.yml +++ b/.github/workflows/Doxygen.yml @@ -20,21 +20,9 @@ jobs: with: doxyfile-path: "doxygen/doxyfile" - name: Deploy - #run: |0 - uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GH_KEY }} publish_dir: ./build/docs/html + publish_branch: docs enable_jekyll: true - #cp -r doxygen-out/html/* docs - -# - name: commit -# continue-on-error: true -# run: | -# git config --global user.email "tumblegmaer@gmail.com" -# git config --global user.name "Github Actions" -# git add . -# git commit -m "docs update" -# git push -# exit From cc9bf4fc73e5f3c9e0bce72a197d3a8a88d252de Mon Sep 17 00:00:00 2001 From: Tumble Date: Tue, 21 Sep 2021 00:29:37 +0100 Subject: [PATCH 3/8] ok new thing --- .github/workflows/Doxygen.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Doxygen.yml b/.github/workflows/Doxygen.yml index e6b2bf24..35da04db 100644 --- a/.github/workflows/Doxygen.yml +++ b/.github/workflows/Doxygen.yml @@ -15,6 +15,7 @@ jobs: - name: Prepare docs run: | mkdir -p build/docs + cp -r doxygen-out/html/* docs - name: "Generate Documentation" uses: mattnotmitt/doxygen-action@v1 with: @@ -23,6 +24,6 @@ jobs: uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GH_KEY }} - publish_dir: ./build/docs/html + publish_dir: ./docs publish_branch: docs enable_jekyll: true From 9591c436595f0c400689804e94be7a463a92a30e Mon Sep 17 00:00:00 2001 From: Tumble Date: Tue, 21 Sep 2021 00:31:31 +0100 Subject: [PATCH 4/8] ok this should be right now --- .github/workflows/Doxygen.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Doxygen.yml b/.github/workflows/Doxygen.yml index 35da04db..298fab03 100644 --- a/.github/workflows/Doxygen.yml +++ b/.github/workflows/Doxygen.yml @@ -12,14 +12,13 @@ jobs: steps: - name: Checkout Branch uses: actions/checkout@v2-beta # use either @v2-beta or @master. Eventually there will be a @v2 tag. - - name: Prepare docs - run: | - mkdir -p build/docs - cp -r doxygen-out/html/* docs - name: "Generate Documentation" uses: mattnotmitt/doxygen-action@v1 with: doxyfile-path: "doxygen/doxyfile" + - name: Prepare docs + run: | + cp -r doxygen-out/html/* docs - name: Deploy uses: peaceiris/actions-gh-pages@v3 with: From 3a5c317c12323a6de7f87d61eab48c588399b908 Mon Sep 17 00:00:00 2001 From: Tumble Date: Tue, 21 Sep 2021 00:32:26 +0100 Subject: [PATCH 5/8] ok --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index af0a58d2..d89290c1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -10,7 +10,7 @@ # supported CodeQL languages. # name: "Code Quality" -on: [push, pull_request] +on: [push] jobs: analyze: name: Analyze From 8c0eb9d2fd640fe4d7b803c2785ecf16b0e3096e Mon Sep 17 00:00:00 2001 From: Tumble Date: Tue, 21 Sep 2021 00:37:07 +0100 Subject: [PATCH 6/8] combined quality checkoing into unitesting --- .github/workflows/UnitTests.yml | 7 +++++++ .github/workflows/{ => disabled}/codeql-analysis.yml | 0 2 files changed, 7 insertions(+) rename .github/workflows/{ => disabled}/codeql-analysis.yml (100%) diff --git a/.github/workflows/UnitTests.yml b/.github/workflows/UnitTests.yml index 0f7a3e98..3fbefca2 100644 --- a/.github/workflows/UnitTests.yml +++ b/.github/workflows/UnitTests.yml @@ -10,6 +10,11 @@ jobs: - name: Checkout Branch uses: actions/checkout@v2-beta # use either @v2-beta or @master. Eventually there will be a @v2 tag. + - name: Initialize Code Quality Analysis + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + - name: Install Dependencies run: | sudo apt update -y @@ -24,6 +29,8 @@ jobs: - name: Build run: | github-scripts/debian.sh build + - name: Perform Code Quality Analysis + uses: github/codeql-action/analyze@v1 - name: Package run: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/disabled/codeql-analysis.yml similarity index 100% rename from .github/workflows/codeql-analysis.yml rename to .github/workflows/disabled/codeql-analysis.yml From 8d92ab745e0f740620e2ce02cd1b0f40d08d78ad Mon Sep 17 00:00:00 2001 From: Tumble Date: Tue, 21 Sep 2021 00:41:27 +0100 Subject: [PATCH 7/8] bring back code anylisys --- .github/workflows/UnitTests.yml | 9 +------- .../{disabled => }/codeql-analysis.yml | 22 +------------------ 2 files changed, 2 insertions(+), 29 deletions(-) rename .github/workflows/{disabled => }/codeql-analysis.yml (54%) diff --git a/.github/workflows/UnitTests.yml b/.github/workflows/UnitTests.yml index 3fbefca2..deebcd71 100644 --- a/.github/workflows/UnitTests.yml +++ b/.github/workflows/UnitTests.yml @@ -10,11 +10,6 @@ jobs: - name: Checkout Branch uses: actions/checkout@v2-beta # use either @v2-beta or @master. Eventually there will be a @v2 tag. - - name: Initialize Code Quality Analysis - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - - name: Install Dependencies run: | sudo apt update -y @@ -28,9 +23,7 @@ jobs: - name: Build run: | - github-scripts/debian.sh build - - name: Perform Code Quality Analysis - uses: github/codeql-action/analyze@v1 + github-scripts/debian.sh builds - name: Package run: | diff --git a/.github/workflows/disabled/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml similarity index 54% rename from .github/workflows/disabled/codeql-analysis.yml rename to .github/workflows/codeql-analysis.yml index d89290c1..346fe856 100644 --- a/.github/workflows/disabled/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -10,7 +10,7 @@ # supported CodeQL languages. # name: "Code Quality" -on: [push] +on: [push,pull_request] jobs: analyze: name: Analyze @@ -24,10 +24,6 @@ jobs: fail-fast: false matrix: language: ["cpp"] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - steps: - name: Checkout repository uses: actions/checkout@v2 @@ -37,22 +33,6 @@ jobs: uses: github/codeql-action/init@v1 with: languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - # - name: Autobuild - # uses: github/codeql-action/autobuild@v1 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - name: Install Dependencies run: | From 5d26d6e0a7d91cd582d38054ce151b79a433333a Mon Sep 17 00:00:00 2001 From: Tumble Date: Tue, 21 Sep 2021 00:57:02 +0100 Subject: [PATCH 8/8] config files --- .github/codeql/codeql-config.yml | 0 .github/workflows/codeql-analysis.yml | 1 + 2 files changed, 1 insertion(+) create mode 100644 .github/codeql/codeql-config.yml diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml new file mode 100644 index 00000000..e69de29b diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 346fe856..2d3f6d5f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -32,6 +32,7 @@ jobs: - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: + config-file: ./.github/codeql/codeql-config.yml languages: ${{ matrix.language }} - name: Install Dependencies