Back out changes to non-source files

This commit is contained in:
Thomas Göttgens 2023-01-21 16:17:08 +01:00
parent 9ebe24e680
commit ab3446faed
21 changed files with 151 additions and 147 deletions

View File

@ -1,5 +1,5 @@
name: "Setup Build Base Composite Action"
description: "Base build actions for Meshtastic Platform IO steps"
name: 'Setup Build Base Composite Action'
description: 'Base build actions for Meshtastic Platform IO steps'
runs:
using: "composite"

View File

@ -22,8 +22,8 @@ jobs:
- name: flawfinder_scan
uses: david-a-wheeler/flawfinder@2.0.19
with:
arguments: "--sarif ./"
output: "flawfinder_report.sarif"
arguments: '--sarif ./'
output: 'flawfinder_report.sarif'
# step 3
- name: save report as pipeline artifact

View File

@ -6,15 +6,17 @@ on:
branches:
- master
schedule:
- cron: "0 1 * * 6"
- cron: '0 1 * * 6'
jobs:
semgrep-full:
runs-on: ubuntu-latest
container:
image: returntocorp/semgrep
steps:
# step 1
- name: clone application source code
uses: actions/checkout@v3

View File

@ -1,14 +1,17 @@
---
name: Semgrep Differential Scan
on: pull_request
on:
pull_request
jobs:
semgrep-diff:
runs-on: ubuntu-latest
container:
image: returntocorp/semgrep
steps:
# step 1
- name: clone application source code
uses: actions/checkout@v3

View File

@ -8,16 +8,17 @@ plugins:
uri: https://github.com/trunk-io/plugins
lint:
enabled:
- git-diff-check
- gitleaks@8.15.2
- clang-format@14.0.0
- prettier@2.8.3
disabled:
- shellcheck@0.9.0
- shfmt@3.5.0
- oxipng@8.0.0
- actionlint@1.6.22
- git-diff-check
- gitleaks@8.15.2
- markdownlint@0.33.0
- hadolint@2.12.0
- clang-format@14.0.0
- prettier@2.8.3
- svgo@3.0.2
runtimes:
enabled:

View File

@ -2,8 +2,8 @@
set -e
VERSION=$(bin/buildinfo.py long)
SHORT_VERSION=$(bin/buildinfo.py short)
VERSION=`bin/buildinfo.py long`
SHORT_VERSION=`bin/buildinfo.py short`
OUTDIR=release/

View File

@ -2,8 +2,8 @@
set -e
VERSION=$(bin/buildinfo.py long)
SHORT_VERSION=$(bin/buildinfo.py short)
VERSION=`bin/buildinfo.py long`
SHORT_VERSION=`bin/buildinfo.py short`
OUTDIR=release/
@ -20,3 +20,4 @@ cp .pio/build/native/program $OUTDIR/meshtasticd_linux_amd64
cp bin/device-install.* $OUTDIR
cp bin/device-update.* $OUTDIR

View File

@ -2,8 +2,8 @@
set -e
VERSION=$(bin/buildinfo.py long)
SHORT_VERSION=$(bin/buildinfo.py short)
VERSION=`bin/buildinfo.py long`
SHORT_VERSION=`bin/buildinfo.py short`
OUTDIR=release/

View File

@ -2,8 +2,8 @@
set -e
VERSION=$(bin/buildinfo.py long)
SHORT_VERSION=$(bin/buildinfo.py short)
VERSION=`bin/buildinfo.py long`
SHORT_VERSION=`bin/buildinfo.py short`
OUTDIR=release/

View File

@ -4,7 +4,7 @@
set -e
VERSION=$(bin/buildinfo.py long)
VERSION=`bin/buildinfo.py long`
# The shell vars the build tool expects to find
export APP_VERSION=$VERSION

View File

@ -18,20 +18,18 @@ Flash image file to device, but first erasing and writing system information"
EOF
}
while getopts ":hp:P:f:" opt; do
case "${opt}" in
h)
show_help
exit 0
;;
p)
export ESPTOOL_PORT=${OPTARG}
p) export ESPTOOL_PORT=${OPTARG}
;;
P)
PYTHON=${OPTARG}
P) PYTHON=${OPTARG}
;;
f)
FILENAME=${OPTARG}
f) FILENAME=${OPTARG}
;;
*)
echo "Invalid flag."

View File

@ -16,20 +16,18 @@ Flash image file to device, leave existing system intact."
EOF
}
while getopts ":hp:P:f:" opt; do
case "${opt}" in
h)
show_help
exit 0
;;
p)
export ESPTOOL_PORT=${OPTARG}
p) export ESPTOOL_PORT=${OPTARG}
;;
P)
PYTHON=${OPTARG}
P) PYTHON=${OPTARG}
;;
f)
FILENAME=${OPTARG}
f) FILENAME=${OPTARG}
;;
*)
echo "Invalid flag."

View File

@ -4,7 +4,7 @@ set -e
echo "This script is only for developers who are publishing new builds on github. Most users don't need it"
VERSION=$(bin/buildinfo.py long)
VERSION=`bin/buildinfo.py long`
# Must have a V prefix to trigger github
git tag "v${VERSION}"

View File

@ -8,3 +8,4 @@ sleep 20 # 5 seconds was not enough
echo "Simulator started, launching python test..."
python3 -c 'from meshtastic.test import testSimulator; testSimulator()'