From 4afc296b9c1d41acb80dad61ec16b1e3fd9df35e Mon Sep 17 00:00:00 2001 From: Peter Jakobs Date: Mon, 23 Dec 2024 09:57:12 +0100 Subject: [PATCH] removed CodeQL and changes to deployment workflow. --- .github/workflows/codeQL.yml | 96 ----------- .github/workflows/deploy-pages.yml | 250 ++++++++++++++--------------- 2 files changed, 125 insertions(+), 221 deletions(-) delete mode 100644 .github/workflows/codeQL.yml diff --git a/.github/workflows/codeQL.yml b/.github/workflows/codeQL.yml deleted file mode 100644 index f26f81e..0000000 --- a/.github/workflows/codeQL.yml +++ /dev/null @@ -1,96 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL Advanced" - -on: - push: - branches: [ "develop" ] - pull_request: - branches: [ "develop" ] - schedule: - - cron: '26 9 * * 5' - -jobs: - analyze: - name: Analyze (${{ matrix.language }}) - # Runner size impacts CodeQL analysis time. To learn more, please see: - # - https://gh.io/recommended-hardware-resources-for-running-codeql - # - https://gh.io/supported-runners-and-hardware-resources - # - https://gh.io/using-larger-runners (GitHub.com only) - # Consider using larger runners or machines with greater resources for possible analysis time improvements. - runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} - permissions: - # required for all workflows - security-events: write - - # required to fetch internal or private CodeQL packs - packages: read - - # only required for workflows in private repositories - actions: read - contents: read - - strategy: - fail-fast: false - matrix: - include: - - language: c-cpp - build-mode: autobuild - #- language: javascript-typescript - # build-mode: none - #- language: python - # build-mode: none - # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' - # Use `c-cpp` to analyze code written in C, C++ or both - # Use 'java-kotlin' to analyze code written in Java, Kotlin or both - # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both - # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, - # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. - # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how - # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 - with: - languages: ${{ matrix.language }} - build-mode: ${{ matrix.build-mode }} - # 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. - - # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - # If the analyze step fails for one of the languages you are analyzing with - # "We were unable to automatically build your code", modify the matrix above - # to set the build mode to "manual" for that language. Then modify this step - # to build your code. - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - if: matrix.build-mode == 'manual' - shell: bash - run: | - echo 'If you are using a "manual" build mode for one or more of the' \ - 'languages you are analyzing, replace this with the commands to build' \ - 'your code, for example:' - echo ' make bootstrap' - echo ' make release' - exit 1 - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 - with: - category: "/language:${{matrix.language}}" diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml index 53d0a24..96ab551 100644 --- a/.github/workflows/deploy-pages.yml +++ b/.github/workflows/deploy-pages.yml @@ -24,148 +24,148 @@ jobs: echo "fw_version=$version" >> $GITHUB_OUTPUT echo "fw_branch=$branch" >> $GITHUB_OUTPUT -publish: - if: ${{ github.event.workflow_run.conclusion == 'success' }} - runs-on: ubuntu-latest + publish: + if: ${{ github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest - steps: - - name: Checkout gh-pages branch - uses: actions/checkout@v2 - with: - ref: gh-pages + steps: + - name: Checkout gh-pages branch + uses: actions/checkout@v2 + with: + ref: gh-pages - - name: Create directories - run: | - mkdir -p download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/debug - mkdir -p download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/release - mkdir -p download/esp32/${{ steps.get_fw_info.outputs.fw_branch }}/debug - mkdir -p download/esp32/${{ steps.get_fw_info.outputs.fw_branch }}/release - mkdir -p download/esp32c3/${{ steps.get_fw_info.outputs.fw_branch }}/debug - mkdir -p download/esp32c3/${{ steps.get_fw_info.outputs.fw_branch }}/release + - name: Create directories + run: | + mkdir -p download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/debug + mkdir -p download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/release + mkdir -p download/esp32/${{ steps.get_fw_info.outputs.fw_branch }}/debug + mkdir -p download/esp32/${{ steps.get_fw_info.outputs.fw_branch }}/release + mkdir -p download/esp32c3/${{ steps.get_fw_info.outputs.fw_branch }}/debug + mkdir -p download/esp32c3/${{ steps.get_fw_info.outputs.fw_branch }}/release - # Download each artifact from the build_firmware workflow and move it to the correct path - - name: Download esp8266 debug - uses: actions/download-artifact@v3 - with: - name: lightinator-esp8266-debug - path: download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/debug + # Download each artifact from the build_firmware workflow and move it to the correct path + - name: Download esp8266 debug + uses: actions/download-artifact@v3 + with: + name: lightinator-esp8266-debug + path: download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/debug - - name: Download esp8266 release - uses: actions/download-artifact@v3 - with: - name: lightinator-esp8266-release - path: download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/release + - name: Download esp8266 release + uses: actions/download-artifact@v3 + with: + name: lightinator-esp8266-release + path: download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/release - - name: Download esp32 debug - uses: actions/download-artifact@v3 - with: - name: lightinator-esp32-debug - path: download/esp32/${{ steps.get_fw_info.outputs.fw_branch }}/debug + - name: Download esp32 debug + uses: actions/download-artifact@v3 + with: + name: lightinator-esp32-debug + path: download/esp32/${{ steps.get_fw_info.outputs.fw_branch }}/debug - - name: Download esp32 release - uses: actions/download-artifact@v3 - with: - name: lightinator-esp32-release - path: download/esp32/${{ steps.get_fw_info.outputs.fw_branch }}/release + - name: Download esp32 release + uses: actions/download-artifact@v3 + with: + name: lightinator-esp32-release + path: download/esp32/${{ steps.get_fw_info.outputs.fw_branch }}/release - - name: Download esp32c3 debug - uses: actions/download-artifact@v3 - with: - name: lightinator-esp32c3-debug - path: download/esp32c3/${{ steps.get_fw_info.outputs.fw_branch }}/debug + - name: Download esp32c3 debug + uses: actions/download-artifact@v3 + with: + name: lightinator-esp32c3-debug + path: download/esp32c3/${{ steps.get_fw_info.outputs.fw_branch }}/debug - - name: Download esp32c3 release - uses: actions/download-artifact@v3 - with: - name: lightinator-esp32c3-release - path: download/esp32c3/${{ steps.get_fw_info.outputs.fw_branch }}/release - - - name: Generate firmware.json - run: | - cat < firmware.json - { - "firmware": [ - { - "soc": "esp8266", - "type": "debug", - "branch": "${{ steps.get_fw_info.outputs.fw_branch }}", - "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", - "files": { - "rom": { - "url": "download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/debug/rom0.bin" + - name: Download esp32c3 release + uses: actions/download-artifact@v3 + with: + name: lightinator-esp32c3-release + path: download/esp32c3/${{ steps.get_fw_info.outputs.fw_branch }}/release + + - name: Generate firmware.json + run: | + cat < firmware.json + { + "firmware": [ + { + "soc": "esp8266", + "type": "debug", + "branch": "${{ steps.get_fw_info.outputs.fw_branch }}", + "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", + "files": { + "rom": { + "url": "download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/debug/rom0.bin" + } } - } - }, - { - "soc": "esp8266", - "type": "release", - "branch": "${{ steps.get_fw_info.outputs.fw_branch }}", - "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", - "files": { - "rom": { - "url": "download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/release/rom0.bin" + }, + { + "soc": "esp8266", + "type": "release", + "branch": "${{ steps.get_fw_info.outputs.fw_branch }}", + "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", + "files": { + "rom": { + "url": "download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/release/rom0.bin" + } } - } - }, - { - "soc": "esp32", - "type": "debug", - "branch": "${{ steps.get_fw_info.outputs.fw_branch }}", - "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", - "files": { - "rom": { - "url": "download/esp32/${{ steps.get_fw_info.outputs.fw_branch }}/debug/app.bin" + }, + { + "soc": "esp32", + "type": "debug", + "branch": "${{ steps.get_fw_info.outputs.fw_branch }}", + "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", + "files": { + "rom": { + "url": "download/esp32/${{ steps.get_fw_info.outputs.fw_branch }}/debug/app.bin" + } } - } - }, - { - "soc": "esp32", - "type": "release", - "branch": "${{ steps.get_fw_info.outputs.fw_branch }}", - "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", - "files": { - "rom": { - "url": "download/esp32/${{ steps.get_fw_info.outputs.fw_branch }}/release" + }, + { + "soc": "esp32", + "type": "release", + "branch": "${{ steps.get_fw_info.outputs.fw_branch }}", + "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", + "files": { + "rom": { + "url": "download/esp32/${{ steps.get_fw_info.outputs.fw_branch }}/release" + } } - } - }, - { - "soc": "esp32c3", - "type": "debug", - "branch": "${{ steps.get_fw_info.outputs.fw_branch }}", - "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", - "files": { - "rom": { - "url": "download/esp32c3/${{ steps.get_fw_info.outputs.fw_branch }}/debug" + }, + { + "soc": "esp32c3", + "type": "debug", + "branch": "${{ steps.get_fw_info.outputs.fw_branch }}", + "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", + "files": { + "rom": { + "url": "download/esp32c3/${{ steps.get_fw_info.outputs.fw_branch }}/debug" + } } - } - }, - { - "soc": "esp32c3", - "type": "release", - "branch": "${{ steps.get_fw_info.outputs.fw_branch }}", - "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", - "files": { - "rom": { - "url": "download/esp32c3/${{ steps.get_fw_info.outputs.fw_branch }}/release" + }, + { + "soc": "esp32c3", + "type": "release", + "branch": "${{ steps.get_fw_info.outputs.fw_branch }}", + "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", + "files": { + "rom": { + "url": "download/esp32c3/${{ steps.get_fw_info.outputs.fw_branch }}/release" + } } } + ], + "rom": { + "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", + "url": "download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/release/rom0.bin" + }, + "spiffs": { + "webapp_version": "0.3.3", + "url": "http://rgbww.dronezone.de/testing/spiff_rom.bin" } - ], - "rom": { - "fw_version": "${{ steps.get_fw_version.outputs.fw_version }}", - "url": "download/esp8266/${{ steps.get_fw_info.outputs.fw_branch }}/release/rom0.bin" - }, - "spiffs": { - "webapp_version": "0.3.3", - "url": "http://rgbww.dronezone.de/testing/spiff_rom.bin" } - } - EOF - - # Commit and push to gh-pages - - name: Commit and push changes - run: | + EOF + + # Commit and push to gh-pages + - name: Commit and push changes + run: | git config user.name "GitHub Actions" git config user.email "actions@github.com" git add .