Skip to content

Commit d6fcce8

Browse files
P-R-O-C-H-YP-R-O-C-H-Y
authored
Merge pull request #9 from P-R-O-C-H-Y/fix/ethernet
Fix/ethernet
2 parents 2845724 + f59f87f commit d6fcce8

File tree

3 files changed

+108
-58
lines changed

3 files changed

+108
-58
lines changed

Diff for: ‎.github/workflows/publishlib.yml

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ jobs:
3939
mv "temp_$name"/* libraries-report
4040
fi
4141
rm -r "temp_$name"
42+
if [[ "$name" == "event.json" ]]; then
43+
mkdir -p artifacts/Event\ file
44+
mv libraries-report/event.json /Event\ file/
45+
fi
4246
done
4347
echo "Contents of parent directory:"
4448
ls -R ..

Diff for: ‎.github/workflows/push.yml

+85-30
Original file line numberDiff line numberDiff line change
@@ -48,39 +48,46 @@ jobs:
4848
- name: Build Sketches
4949
run: bash ./.github/scripts/on-push.sh ${{ matrix.chunk }} 15
5050

51-
# Windows and MacOS
52-
build-arduino-win-mac:
53-
name: Arduino on ${{ matrix.os }}
54-
runs-on: ${{ matrix.os }}
55-
strategy:
56-
fail-fast: false
57-
matrix:
58-
os: [windows-latest, macOS-latest]
59-
60-
steps:
61-
- uses: actions/checkout@v4
62-
- uses: actions/setup-python@v5
51+
#Upload cli compile json as artifact
52+
- name: Upload cli compile json
53+
uses: actions/upload-artifact@v4
6354
with:
64-
python-version: '3.x'
65-
- name: Build Sketches
66-
run: bash ./.github/scripts/on-push.sh
55+
name: pr_cli_compile_${{ matrix.chunk }}
56+
path: cli_compile_${{ matrix.chunk }}.json
6757

68-
# PlatformIO on Windows, Ubuntu and Mac
69-
build-platformio:
70-
name: PlatformIO on ${{ matrix.os }}
71-
runs-on: ${{ matrix.os }}
72-
strategy:
73-
fail-fast: false
74-
matrix:
75-
os: [ubuntu-latest, windows-latest, macOS-latest]
58+
# Windows and MacOS
59+
#build-arduino-win-mac:
60+
# name: Arduino on ${{ matrix.os }}
61+
# runs-on: ${{ matrix.os }}
62+
# strategy:
63+
# fail-fast: false
64+
# matrix:
65+
# os: [windows-latest, macOS-latest]
66+
#
67+
# steps:
68+
# - uses: actions/checkout@v4
69+
# - uses: actions/setup-python@v5
70+
# with:
71+
# python-version: '3.x'
72+
# - name: Build Sketches
73+
# run: bash ./.github/scripts/on-push.sh
7674

77-
steps:
78-
- uses: actions/checkout@v4
79-
- uses: actions/setup-python@v5
80-
with:
81-
python-version: '3.x'
82-
- name: Build Sketches
83-
run: bash ./.github/scripts/on-push.sh 1 1 #equal and non-zero to trigger PIO
75+
# PlatformIO on Windows, Ubuntu and Mac
76+
#build-platformio:
77+
# name: PlatformIO on ${{ matrix.os }}
78+
# runs-on: ${{ matrix.os }}
79+
# strategy:
80+
# fail-fast: false
81+
# matrix:
82+
# os: [ubuntu-latest, windows-latest, macOS-latest]
83+
#
84+
# steps:
85+
# - uses: actions/checkout@v4
86+
# - uses: actions/setup-python@v5
87+
# with:
88+
# python-version: '3.x'
89+
# - name: Build Sketches
90+
# run: bash ./.github/scripts/on-push.sh 1 1 #equal and non-zero to trigger PIO
8491

8592
build-esp-idf-component:
8693
name: Build with ESP-IDF ${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
@@ -110,3 +117,51 @@ jobs:
110117
idf.py create-project test
111118
echo CONFIG_FREERTOS_HZ=1000 > test/sdkconfig.defaults
112119
idf.py -C test -DEXTRA_COMPONENT_DIRS=$PWD/components build
120+
121+
# Ubuntu
122+
build-arduino-master-linux:
123+
name: Arduino Master ${{ matrix.chunk }} on ubuntu-latest
124+
runs-on: ubuntu-latest
125+
strategy:
126+
fail-fast: false
127+
matrix:
128+
chunk: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
129+
130+
# Checkout master branch
131+
steps:
132+
- uses: actions/checkout@v4
133+
with:
134+
ref: master
135+
- uses: actions/setup-python@v5
136+
with:
137+
python-version: '3.x'
138+
- name: Cache tools
139+
id: cache-linux
140+
uses: actions/cache@v4
141+
with:
142+
path: |
143+
./tools/dist
144+
~/arduino_ide
145+
key: ${{ runner.os }}-${{ hashFiles('package/package_esp32_index.template.json',
146+
'tools/get.py',
147+
'.github/scripts/install-arduino-ide.sh') }}
148+
- name: Build Sketches
149+
run: bash ./.github/scripts/on-push.sh ${{ matrix.chunk }} 15
150+
151+
#Upload cli compile json as artifact
152+
- name: Upload cli compile json
153+
uses: actions/upload-artifact@v4
154+
with:
155+
name: master_cli_compile_${{ matrix.chunk }}
156+
path: cli_compile_${{ matrix.chunk }}.json
157+
158+
event_file:
159+
name: "Event File"
160+
needs: [build-arduino-linux, build-arduino-master-linux]
161+
runs-on: ubuntu-latest
162+
steps:
163+
- name: Upload
164+
uses: actions/upload-artifact@v4
165+
with:
166+
name: Event File
167+
path: ${{github.event_path}}

Diff for: ‎.github/workflows/sizes.yml

+19-28
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Sizes Test
2+
# Comment
23

34
# The workflow will run labeled pull requests
45
on:
@@ -34,17 +35,17 @@ jobs:
3435

3536
include:
3637
- target: esp32
37-
fqbn: espressif:esp32:esp32
38+
fqbn: espressif:esp32:esp32:PartitionScheme=huge_app"
3839
- target: esp32s2
39-
fqbn: espressif:esp32:esp32s2
40+
fqbn: espressif:esp32:esp32s2:PartitionScheme=huge_app"
4041
- target: esp32c3
41-
fqbn: espressif:esp32:esp32c3
42+
fqbn: espressif:esp32:esp32c3:PartitionScheme=huge_app"
4243
- target: esp32s3
43-
fqbn: espressif:esp32:esp32s3
44+
fqbn: espressif:esp32:esp32s3:PartitionScheme=huge_app"
4445
- target: esp32c6
45-
fqbn: espressif:esp32:esp32c6
46+
fqbn: espressif:esp32:esp32c6:PartitionScheme=huge_app
4647
- target: esp32h2
47-
fqbn: espressif:esp32:esp32h2
48+
fqbn: espressif:esp32:esp32h2:PartitionScheme=huge_app"
4849

4950

5051
steps:
@@ -59,8 +60,9 @@ jobs:
5960
${{ env.REPOSITORY }}
6061
target: ${{ matrix.target }}
6162
fqbn: ${{ matrix.fqbn }}
63+
# The path to the libraries folder
6264
sketch-paths: |
63-
${{ env.REPOSITORY }}
65+
- libraries/
6466
use-json-file: false
6567
enable-deltas-report: true
6668
sketches-report-path: ${{ env.SKETCHES_REPORTS_PATH }}
@@ -74,26 +76,15 @@ jobs:
7476
name: ${{ env.SKETCHES_REPORTS_ARTIFACT_NAME }}-${{ matrix.target }}
7577
path: ${{ env.SKETCHES_REPORTS_PATH }}
7678

77-
report-comment:
78-
needs: compile-sketch # Wait for the compile job to finish to get the data for the report
79+
event_file:
80+
name: "Event File"
81+
if: |
82+
contains(github.event.pull_request.labels.*.name, 'sizes_test')
83+
needs: compile-sketch
7984
runs-on: ubuntu-latest
8085
steps:
81-
# Check out repository
82-
- name: Checkout repository
83-
uses: actions/checkout@v4
84-
with:
85-
token: ${{ env.GITHUB_TOKEN }}
86-
fetch-depth: '0'
87-
88-
# This step is needed to get the size data produced by the compile jobs
89-
- name: Download sketches reports artifact
90-
uses: actions/download-artifact@v4
91-
with:
92-
pattern: ${{ env.SKETCHES_REPORTS_ARTIFACT_NAME }}-*
93-
merge-multiple: true
94-
path: ${{ env.SKETCHES_REPORTS_PATH }}
95-
96-
- name: Report results
97-
uses: P-R-O-C-H-Y/report-size-deltas@sizes
98-
with:
99-
sketches-reports-source: ${{ env.SKETCHES_REPORTS_PATH }}
86+
- name: Upload
87+
uses: actions/upload-artifact@v4
88+
with:
89+
name: Event File
90+
path: ${{github.event_path}}

0 commit comments

Comments
 (0)