Skip to content

Commit 0553e05

Browse files
committed
update build and fix sa
1 parent 6bdbe48 commit 0553e05

File tree

4 files changed

+30
-10
lines changed

4 files changed

+30
-10
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
- name: Checkout repo
1212
uses: actions/checkout@v4
1313
with:
14-
submodules: 'recursive'
14+
submodules: true
1515

1616
- name: Build Main
1717
uses: espressif/esp-idf-ci-action@v1
1818
with:
19-
esp_idf_version: v5.2.2
19+
esp_idf_version: release-v5.4
2020
target: esp32s3
2121
path: '.'

.github/workflows/package_main.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ on:
55
branches: [main]
66
release:
77
types: [published]
8+
workflow_dispatch:
89

910
jobs:
1011
build:
1112

1213
runs-on: ubuntu-latest
1314
continue-on-error: false
1415

16+
outputs:
17+
zipfile-id: ${{ steps.zip_step.outputs.artifact-id }}
18+
1519
steps:
1620
- name: Checkout repo
1721
uses: actions/checkout@v4
@@ -21,19 +25,22 @@ jobs:
2125
- name: Build Main Code
2226
uses: espressif/esp-idf-ci-action@v1
2327
with:
24-
esp_idf_version: v5.2.2
28+
esp_idf_version: release-v5.4
2529
target: esp32s3
2630
path: '.'
2731
command: 'idf.py build'
2832

2933
- name: Upload Build Outputs
3034
uses: actions/upload-artifact@v4
35+
id: zip_step
3136
with:
3237
name: build-artifacts
3338
path: |
39+
build/*.bin
40+
build/*.elf
3441
build/bootloader/bootloader.bin
3542
build/partition_table/partition-table.bin
36-
build/*.bin
43+
build/flasher_args.json
3744
build/flash_args
3845
3946
- name: Attach files to release
@@ -42,7 +49,21 @@ jobs:
4249
with:
4350
files: |
4451
build/*.bin
52+
build/*.elf
4553
build/bootloader/bootloader.bin
4654
build/partition_table/partition-table.bin
55+
build/flasher_args.json
4756
build/flash_args
4857
58+
package:
59+
name: Package the binaries into an executables for Windows, MacOS, and Linux (Ubuntu)
60+
needs: build
61+
strategy:
62+
matrix:
63+
os: [windows-latest, macos-latest, ubuntu-latest]
64+
runs-on: ${{ matrix.os }}
65+
steps:
66+
- uses: esp-cpp/[email protected]
67+
with:
68+
zipfile-id: ${{ needs.build.outputs.zipfile-id }}
69+
programmer-name: 'camera-display_programmer'

.github/workflows/static_analysis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ jobs:
99
steps:
1010
- name: Checkout repo
1111
uses: actions/checkout@v4
12-
with:
13-
submodules: 'recursive'
1412

1513
- name: Run static analysis
1614
uses: esp-cpp/StaticAnalysis@master
1715
with:
1816
# Do not build the project and do not use cmake to generate compile_commands.json
1917
use_cmake: false
2018

21-
# Use the 5.2 release version since it's what we build with
22-
esp_idf_version: release/v5.2
19+
# Use the 5.4 release version since it's what we build with
20+
esp_idf_version: release/v5.4
2321

2422
# (Optional) cppcheck args
25-
cppcheck_args: -i$GITHUB_WORKSPACE/components/espp -i$GITHUB_WORKSPACE/components/jpegdec -i$GITHUB_WORKSPACE/components/esp-protocols --force --enable=all --inline-suppr --inconclusive --platform=mips32 --std=c++17 --suppressions-list=$GITHUB_WORKSPACE/suppressions.txt
23+
cppcheck_args: --force --enable=all --inline-suppr --inconclusive --platform=mips32 --std=c++17 --suppressions-list=$GITHUB_WORKSPACE/suppressions.txt

main/main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ void mdns_print_results(mdns_result_t *results) {
278278
a = r->addr;
279279
while (a) {
280280
if (a->addr.type == ESP_IPADDR_TYPE_V6) {
281-
printf(" AAAA: " IPV6STR "\n", IPV62STR(a->addr.u_addr.ip6));
281+
printf(" AAAA: " IPV6STR "\n",
282+
IPV62STR(a->addr.u_addr.ip6)); // cppcheck-suppress unknownMacro
282283
} else {
283284
printf(" A : " IPSTR "\n", IP2STR(&(a->addr.u_addr.ip4)));
284285
}

0 commit comments

Comments
 (0)