Skip to content

Commit f7cc27e

Browse files
committed
Merge branch 'master' into ci/refactor
2 parents 7ad9c59 + 97c98eb commit f7cc27e

File tree

16 files changed

+440
-269
lines changed

16 files changed

+440
-269
lines changed

.github/scripts/update-version.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ cat package.json | sed "s/.*\"version\":.*/ \"version\": \"$ESP_ARDUINO_VERSION
3232

3333
echo "Updating cores/esp32/esp_arduino_version.h..."
3434
cat cores/esp32/esp_arduino_version.h | \
35-
sed "s/#define ESP_ARDUINO_VERSION_MAJOR.*/#define ESP_ARDUINO_VERSION_MAJOR $ESP_ARDUINO_VERSION_MAJOR/g" | \
36-
sed "s/#define ESP_ARDUINO_VERSION_MINOR.*/#define ESP_ARDUINO_VERSION_MINOR $ESP_ARDUINO_VERSION_MINOR/g" | \
37-
sed "s/#define ESP_ARDUINO_VERSION_PATCH.*/#define ESP_ARDUINO_VERSION_PATCH $ESP_ARDUINO_VERSION_PATCH/g" > __esp_arduino_version.h && mv __esp_arduino_version.h cores/esp32/esp_arduino_version.h
35+
sed "s/#define ESP_ARDUINO_VERSION_MAJOR.*/#define ESP_ARDUINO_VERSION_MAJOR $ESP_ARDUINO_VERSION_MAJOR/g" | \
36+
sed "s/#define ESP_ARDUINO_VERSION_MINOR.*/#define ESP_ARDUINO_VERSION_MINOR $ESP_ARDUINO_VERSION_MINOR/g" | \
37+
sed "s/#define ESP_ARDUINO_VERSION_PATCH.*/#define ESP_ARDUINO_VERSION_PATCH $ESP_ARDUINO_VERSION_PATCH/g" > __esp_arduino_version.h && mv __esp_arduino_version.h cores/esp32/esp_arduino_version.h
3838

3939
exit 0

.github/workflows/lib.json

+8
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@
3535
"~/Arduino/libraries/ESPAsyncWebServer/examples/simple_server/simple_server.ino"
3636
]
3737
},
38+
{
39+
"name": "EthernetESP32",
40+
"exclude_targets": [],
41+
"sketch_path": [
42+
"~/Arduino/libraries/EthernetESP32/examples/LegacyEthernetTest/LegacyEthernetTest.ino",
43+
"~/Arduino/libraries/EthernetESP32/examples/TwoEthernets/TwoEthernets.ino"
44+
]
45+
},
3846
{
3947
"name": "FastLED",
4048
"exclude_targets": [],
+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Sizes Results (master-v2.x)
2+
3+
on:
4+
workflow_dispatch:
5+
6+
env:
7+
# It's convenient to set variables for values used multiple times in the workflow
8+
SKETCHES_REPORTS_PATH: artifacts/sizes-report
9+
RESULT_SIZES_TEST_FILE: SIZES_TEST.md
10+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
11+
12+
jobs:
13+
sizes-test-results:
14+
name: Sizes Comparsion Results
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v4 # This step checks out the repository's code at gh-pages branch
19+
with:
20+
ref: gh-pages
21+
22+
- name: Create folder structure
23+
run: |
24+
mkdir -p artifacts && cd artifacts
25+
mkdir -p sizes-report
26+
mkdir -p sizes-report/master
27+
mkdir -p sizes-report/pr
28+
29+
# master folder is a base for comparison
30+
# pr folder is for comparison with master
31+
- name: Download JSON file
32+
run: |
33+
mv master_cli_compile/*.json artifacts/sizes-report/pr/
34+
mv v2.x_cli_compile/*.json artifacts/sizes-report/master/
35+
36+
- name: Report results
37+
uses: P-R-O-C-H-Y/report-size-deltas@sizes_v2
38+
with:
39+
sketches-reports-source: ${{ env.SKETCHES_REPORTS_PATH }}
40+
github-token: ${{ env.GITHUB_TOKEN }}
41+
destination-file: ${{ env.RESULT_SIZES_TEST_FILE }}
42+
43+
- name: Append file with action URL
44+
run:
45+
echo "/ [GitHub Action Link](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}})" >> ${{ env.RESULT_SIZES_TEST_FILE }}
46+
47+
- name: Push to github repo
48+
run: |
49+
git config user.name github-actions
50+
git config user.email [email protected]
51+
git add ${{ env.RESULT_SIZES_TEST_FILE }}
52+
git commit -m "Generated Sizes Results (master-v2.x)"
53+
git push origin HEAD:gh-pages

0 commit comments

Comments
 (0)