Skip to content

Commit

Permalink
Merge pull request #44 from DarkFlippers/fix/ci-cd
Browse files Browse the repository at this point in the history 
fix: matrix building
  • Loading branch information
@derskythe
derskythe authored Sep 10, 2023
2 parents e14891f + 935ba9b commit 1cc7ea2
Show file tree
Hide file tree
Showing 2 changed files with 150 additions and 149 deletions.
29 changes: 15 additions & 14 deletions .github/workflows/build-with-firmwware.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
required: false
type: string
release:
types: [ created,prereleased ]
types: [created, prereleased]
push:
paths:
- .github/workflows/build-with-firmware.yml
Expand All @@ -18,26 +18,27 @@ permissions:
contents: write
packages: write

concurrency:
group: firmware-build-${{ vars.FIRMWARE_VERSION }}-${{ vars.RELEASE_VERSION }}
cancel-in-progress: false

jobs:
build-and-upload:
runs-on: ubuntu-latest
concurrency:
group: firmware-build-${{ vars.FIRMWARE_VERSION }}-${{ vars.RELEASE_VERSION }}
cancel-in-progress: false
env:
REPO_SELF: ${{ vars.REPO_SELF }}
OFW_PATH: "applications_user/subbrute"
RELATIVE_PATH: "applications/external/subbrute"
CURRENT_VERSION: ${{ vars.RELEASE_VERSION }}
RELEASE_VERSION: ${{ vars.RELEASE_VERSION }}
ZIP_NAME: ''
ZIP_TAG: ''
TGZ_NAME: ''
TGZ_TAG: ''
ZIP_NAME: ""
ZIP_TAG: ""
TGZ_NAME: ""
TGZ_TAG: ""
strategy:
fail-fast: false
matrix:
firmware: [ unlshd ]
firmware: [unlshd, official]
include:
- firmware: unlshd
url: ${{ vars.REPO_UNLEASHED }}
Expand Down Expand Up @@ -143,11 +144,11 @@ jobs:
run: |
Remove-Item -Force -Recurse ./applications/debug -ErrorAction SilentlyContinue
Remove-Item -Force -Recurse ./applications/examples -ErrorAction SilentlyContinue
# New-Item -Force ./tmp -ItemType Directory -ErrorAction SilentlyContinue
# Copy-Item -Force -Recurse ./applications/external/subbrute/ ./tmp/ -ErrorAction SilentlyContinue
# Remove-Item -Force -Recurse ./applications/external/* -ErrorAction SilentlyContinue
# Copy-Item -Force -Recurse /tmp/* ./applications/external/ -ErrorAction SilentlyContinue
# Remove-Item -Force -Recurse ./tmp -ErrorAction SilentlyContinue
# New-Item -Force ./tmp -ItemType Directory -ErrorAction SilentlyContinue
# Copy-Item -Force -Recurse ./applications/external/subbrute/ ./tmp/ -ErrorAction SilentlyContinue
# Remove-Item -Force -Recurse ./applications/external/* -ErrorAction SilentlyContinue
# Copy-Item -Force -Recurse /tmp/* ./applications/external/ -ErrorAction SilentlyContinue
# Remove-Item -Force -Recurse ./tmp -ErrorAction SilentlyContinue

- name: Build Firmware
shell: bash
Expand Down
270 changes: 135 additions & 135 deletions .github/workflows/codeql.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ name: "CodeQL"

on:
push:
branches: [ "master", "feat/ci" ]
branches: ["master", "feat/ci"]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "master" ]
branches: ["master"]
schedule:
- cron: '43 14 * * *'
- cron: "43 14 * * *"
workflow_dispatch:

jobs:
Expand All @@ -29,7 +29,7 @@ jobs:
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners
# Consider using larger runners for possible analysis time improvements.
runs-on: 'ubuntu-latest'
runs-on: "ubuntu-latest"
timeout-minutes: 360
permissions:
actions: read
Expand All @@ -39,7 +39,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'cpp' ]
language: ["cpp"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
# Use only 'java' to analyze code written in Java, Kotlin or both
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
Expand All @@ -52,137 +52,137 @@ jobs:
RELEASE_VERSION: ${{ vars.RELEASE_VERSION }}
TOKEN: ${{ secrets.DEPENDABOT }}
REF_NAME: ${{ github.ref_name }}

steps:
- name: Checkout Firmware Files
uses: actions/checkout@v3
with:
repository: "${{ vars.REPO_UNLEASHED }}"
clean: "true"
submodules: "true"
ref: "dev"
fetch-depth: '0'
- name: Checkout Repo Files
uses: actions/checkout@v3
with:
repository: "${{ vars.REPO_SELF }}"
clean: "true"
submodules: "true"
path: "${{ env.OFW_PATH }}"
fetch-depth: '0'

- name: Remove other apps
shell: pwsh
if: ${{ success() }}
# rm to remove problem FAP which includes non-existent files
run: |
Remove-Item -Force -Recurse ./applications/debug -ErrorAction SilentlyContinue
Remove-Item -Force -Recurse ./applications/examples -ErrorAction SilentlyContinue
- name: Set refname
env:
REF_NAME: ${{ env.REF_NAME }}
shell: pwsh
run: |
$ReleaseVersion = ([string]::IsNullOrWhitespace($env:REF_NAME) ? 'dev' : $env:REF_NAME)
Write-Output ('REF_NAME={0}' -f $ReleaseVersion) >> $env:GITHUB_ENV
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
setup-python-dependencies: true
#debug: true
# 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

- name: Restore cached FW
id: cache-fw-restore
uses: actions/cache/restore@v3
with:
path: |
./build
./dist
./firmware
key: ${{ runner.os }}-fw

- name: Build Firmware
shell: bash
if: ${{ success() }}
env:
FBT_NO_SYNC: 0
DIST_SUFFIX: 'codeql'
WORKFLOW_BRANCH_OR_TAG: release-cfw
run: |
- name: Checkout Firmware Files
uses: actions/checkout@v3
with:
repository: "${{ vars.REPO_UNLEASHED }}"
clean: "true"
submodules: "true"
ref: "dev"
fetch-depth: "0"

- name: Checkout Repo Files
uses: actions/checkout@v3
with:
repository: "${{ vars.REPO_SELF }}"
clean: "true"
submodules: "true"
path: "${{ env.OFW_PATH }}"
fetch-depth: "0"

- name: Remove other apps
shell: pwsh
if: ${{ success() }}
# rm to remove problem FAP which includes non-existent files
run: |
Remove-Item -Force -Recurse ./applications/debug -ErrorAction SilentlyContinue
Remove-Item -Force -Recurse ./applications/examples -ErrorAction SilentlyContinue
- name: Set refname
env:
REF_NAME: ${{ env.REF_NAME }}
shell: pwsh
run: |
$ReleaseVersion = ([string]::IsNullOrWhitespace($env:REF_NAME) ? 'dev' : $env:REF_NAME)
Write-Output ('REF_NAME={0}' -f $ReleaseVersion) >> $env:GITHUB_ENV
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
setup-python-dependencies: true
#debug: true
# 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

# - name: Restore cached FW
# id: cache-fw-restore
# uses: actions/cache/restore@v3
# with:
# path: |
# ./build
# ./dist
# ./firmware
# key: ${{ runner.os }}-fw

- name: Build Firmware
shell: bash
if: ${{ success() }}
env:
FBT_NO_SYNC: 0
DIST_SUFFIX: "codeql"
WORKFLOW_BRANCH_OR_TAG: release-cfw
run: |
./fbt COMPACT=1 DEBUG=0 FBT_NO_SYNC=${{ env.FBT_NO_SYNC }}
- name: Build FAPs
shell: bash
if: ${{ success() }}
env:
FBT_NO_SYNC: 0
DIST_SUFFIX: 'codeql'
WORKFLOW_BRANCH_OR_TAG: release-cfw
# rm to remove problem FAP which includes non-existent files
run: |
- name: Build FAPs
shell: bash
if: ${{ success() }}
env:
FBT_NO_SYNC: 0
DIST_SUFFIX: "codeql"
WORKFLOW_BRANCH_OR_TAG: release-cfw
# rm to remove problem FAP which includes non-existent files
run: |
./fbt COMPACT=1 DEBUG=0 FBT_NO_SYNC=${{ env.FBT_NO_SYNC }} fap_dist
- name: Save cached FW
id: cache-primes-save
uses: actions/cache/save@v3
with:
path: |
./build
./dist
./firmware
key: ${{ steps.cache-fw-restore.outputs.cache-primary-key }}
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
#- name: Autobuild
# run: |
# echo "Run, Build Application using script"
# ls -lha
# ./fbt
# uses: github/codeql-action/autobuild@v2
- name: Resolve CodeQL Build Env
uses: github/codeql-action/resolve-environment@v2
with:
language: ${{ matrix.language }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
env:
REF_NAME: ${{ env.REF_NAME }}
CHECKOUT_PATH: ${{ env.OFW_PATH }}
with:
category: "/language:${{matrix.language}}"
token: ${{ secrets.DEPENDABOT }}
# Must be used only with sha
#ref: ${{ env.REF_NAME }}
#sha: ${{ github.sha }}
output: "a${{ env.CHECKOUT_PATH }}/.github/results.sarif"
check_name: "_"
upload-database: false
upload: 'failure-only'
checkout_path: "${{ github.workspace }}/${{ env.CHECKOUT_PATH }}"

- name: Upload CodeQL SARIF
uses: github/codeql-action/upload-sarif@v2
env:
REF_NAME: ${{ env.REF_NAME }}
CHECKOUT_PATH: ${{ env.OFW_PATH }}
with:
category: "/language:${{matrix.language}}"
#token: ${{ secrets.DEPENDABOT }}
# Must be used only with sha
#ref: ${{ env.REF_NAME }}
#sha: ${{ github.sha }}
sarif_file: "a${{ env.CHECKOUT_PATH }}/.github/results.sarif"
checkout_path: "${{ github.workspace }}/${{ env.CHECKOUT_PATH }}"
# - name: Save cached FW
# id: cache-primes-save
# uses: actions/cache/save@v3
# with:
# path: |
# ./build
# ./dist
# ./firmware
# key: ${{ steps.cache-fw-restore.outputs.cache-primary-key }}

# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
#- name: Autobuild
# run: |
# echo "Run, Build Application using script"
# ls -lha
# ./fbt
# uses: github/codeql-action/autobuild@v2
- name: Resolve CodeQL Build Env
uses: github/codeql-action/resolve-environment@v2
with:
language: ${{ matrix.language }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
env:
REF_NAME: ${{ env.REF_NAME }}
CHECKOUT_PATH: ${{ env.OFW_PATH }}
with:
category: "/language:${{matrix.language}}"
token: ${{ secrets.DEPENDABOT }}
# Must be used only with sha
#ref: ${{ env.REF_NAME }}
#sha: ${{ github.sha }}
output: "a${{ env.CHECKOUT_PATH }}/.github/results.sarif"
check_name: "_"
upload-database: false
upload: "failure-only"
checkout_path: "${{ github.workspace }}/${{ env.CHECKOUT_PATH }}"

- name: Upload CodeQL SARIF
uses: github/codeql-action/upload-sarif@v2
env:
REF_NAME: ${{ env.REF_NAME }}
CHECKOUT_PATH: ${{ env.OFW_PATH }}
with:
category: "/language:${{matrix.language}}"
#token: ${{ secrets.DEPENDABOT }}
# Must be used only with sha
#ref: ${{ env.REF_NAME }}
#sha: ${{ github.sha }}
sarif_file: "a${{ env.CHECKOUT_PATH }}/.github/results.sarif"
checkout_path: "${{ github.workspace }}/${{ env.CHECKOUT_PATH }}"

0 comments on commit 1cc7ea2

Please sign in to comment.