Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Global] Overhaul and Cleanup #624

Merged
merged 20 commits into from
Dec 29, 2024
Merged

[Global] Overhaul and Cleanup #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4f75c60
Lets try this again shall we.
rouing Dec 29, 2024
6c63ab5
Almost there
rouing Dec 29, 2024
2dabdab
I think I got it?
rouing Dec 29, 2024
c9c78f6
oops
rouing Dec 29, 2024
b7760d8
Better cache
rouing Dec 29, 2024
79dfeab
almost
rouing Dec 29, 2024
753a8bc
GAWD DAMN IT
rouing Dec 29, 2024
0adcfa1
One more time with the cache
rouing Dec 29, 2024
e51d4c7
Cache
rouing Dec 29, 2024
ad258b1
Board name to cache
rouing Dec 29, 2024
51673f5
Ok so this should have 0 compiling, all cache
rouing Dec 29, 2024
d70326d
Ok so cant use hash, changes too often.
rouing Dec 29, 2024
f587206
Add cache to other builds
rouing Dec 29, 2024
ecfd42c
use our custom firmware merge
rouing Dec 29, 2024
62d33dd
...
rouing Dec 29, 2024
1bde3a9
fix.
rouing Dec 29, 2024
9177f09
finishing up
rouing Dec 29, 2024
dcc7f8f
using restore-keys to find latest
rouing Dec 29, 2024
ead6343
added smoochiee's board
rouing Dec 29, 2024
fb6ef7d
Further Definitions
rouing Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
384 changes: 187 additions & 197 deletions .github/workflows/PR_All_envs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,206 +1,196 @@
---
name: PR Check All envs on Dispatch
name: PR Check All envs on Dispatch

on:
workflow_dispatch:
inputs:
pr_number:
description: 'Pull Request Number'
type: string
required: true
on:
workflow_dispatch:
inputs:
pr_number:
description: "Pull Request Number"
type: string
required: true

jobs:
compile_sketch:
name: Build ${{ matrix.board.name }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
board:
- {
name: "M5Cardputer",
env: "m5stack-cardputer",
partitions: {
bootloader_addr: "0x0000",
},
}
- {
name: "M5StickCPlus2",
env: "m5stack-cplus2",
partitions: {
bootloader_addr: "0x1000",
},
}
- {
name: "M5StickCPlus",
env: "m5stack-cplus1_1",
partitions: {
bootloader_addr: "0x1000",
},
}
- {
name: "M5StickCPlus_Launcher",
env: "LAUNCHER_m5stack-cplus1_1",
partitions: {
bootloader_addr: "0x1000",
},
}
- {
name: "Core2",
env: "m5stack-core2",
partitions: {
bootloader_addr: "0x1000",
},
}
- {
name: "Core16mb",
env: "m5stack-core16mb",
partitions: {
bootloader_addr: "0x1000",
},
}
- {
name: "Core4mb",
env: "m5stack-core4mb",
partitions: {
bootloader_addr: "0x1000",
},
}
- {
name: "CoreS3",
env: "m5stack-cores3",
partitions: {
bootloader_addr: "0x0",
},
}
- {
name: "ESP32-S3",
env: "esp32-s3-devkitc-1",
partitions: {
bootloader_addr: "0x0",
},
}
- {
name: "CYD-2432S028",
env: "CYD-2432S028",
partitions: {
bootloader_addr: "0x1000",
},
}
- {
name: "CYD-2USB",
env: "CYD-2USB",
partitions: {
bootloader_addr: "0x1000",
},
}
- {
name: "CYD-2432W328C",
env: "CYD-2432W328C",
partitions: {
bootloader_addr: "0x1000"
},
}
- {
name: "CYD-2432W328C(inv_colors)_and_CYD-2432S024C",
env: "CYD-2432W328C_2",
partitions: {
bootloader_addr: "0x1000"
},
}
- {
name: "CYD-2432S028_Launcher",
env: "LAUNCHER_CYD-2432S028",
partitions: {
bootloader_addr: "0x1000",
},
}
- {
name: "CYD-2USB_Launcher",
env: "LAUNCHER_CYD-2USB",
partitions: {
bootloader_addr: "0x1000",
},
}
- {
name: "CYD-2432W328C_Launcher",
env: "LAUNCHER_CYD-2432W328C",
partitions: {
bootloader_addr: "0x1000"
},
}
- {
name: "Lilygo_T-Embed_CC1101",
env: "lilygo-t-embed-cc1101",
partitions: {
bootloader_addr: "0x0",
},
}
- {
name: "Lilygo_T-Embed",
env: "lilygo-t-embed",
partitions: {
bootloader_addr: "0x0",
},
}
- {
name: "Lilygo_T-Deck",
env: "lilygo-t-deck",
partitions: {
bootloader_addr: "0x0",
},
}
- {
name: "Lilygo_T-Deck-Pro",
env: "lilygo-t-deck-pro",
partitions: {
bootloader_addr: "0x0",
},
}
steps:
- uses: actions/checkout@v4
with:
ref: refs/pull/${{ github.event.inputs.pr_number }}/merge
jobs:
compile_sketch:
name: Build ${{ matrix.board.name }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
board:
- {
name: "M5Cardputer",
env: "m5stack-cardputer",
partitions: { bootloader_addr: "0x0000" },
}
- {
name: "M5StickCPlus2",
env: "m5stack-cplus2",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "M5StickCPlus",
env: "m5stack-cplus1_1",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "M5StickCPlus_Launcher",
env: "LAUNCHER_m5stack-cplus1_1",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "Core2",
env: "m5stack-core2",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "Core16mb",
env: "m5stack-core16mb",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "Core4mb",
env: "m5stack-core4mb",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "CoreS3",
env: "m5stack-cores3",
partitions: { bootloader_addr: "0x0" },
}
- {
name: "ESP32-S3",
env: "esp32-s3-devkitc-1",
partitions: { bootloader_addr: "0x0" },
}
- {
name: "CYD-2432S028",
env: "CYD-2432S028",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "CYD-2USB",
env: "CYD-2USB",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "CYD-2432W328C",
env: "CYD-2432W328C",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "CYD-2432W328C(inv_colors)_and_CYD-2432S024C",
env: "CYD-2432W328C_2",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "CYD-2432S028_Launcher",
env: "LAUNCHER_CYD-2432S028",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "CYD-2USB_Launcher",
env: "LAUNCHER_CYD-2USB",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "CYD-2432W328C_Launcher",
env: "LAUNCHER_CYD-2432W328C",
partitions: { bootloader_addr: "0x1000" },
}
- {
name: "Lilygo_T-Embed_CC1101",
env: "lilygo-t-embed-cc1101",
partitions: { bootloader_addr: "0x0" },
}
- {
name: "Lilygo_T-Embed",
env: "lilygo-t-embed",
partitions: { bootloader_addr: "0x0" },
}
- {
name: "Lilygo_T-Deck",
env: "lilygo-t-deck",
partitions: { bootloader_addr: "0x0" },
}
- {
name: "Lilygo_T-Deck-Pro",
env: "lilygo-t-deck-pro",
partitions: { bootloader_addr: "0x0" },
}
- {
name: "Smoochiee-Board",
env: "smoochiee-board",
partitions: { bootloader_addr: "0x0" },
}
steps:
- uses: actions/checkout@v4
with:
ref: refs/pull/${{ github.event.inputs.pr_number }}/merge

- id: build
name: Setup Python
uses: actions/setup-python@v2
with:
python-version: "3.x"
- id: build
name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.x"

- name: Install Dependencies
run: |
pip install requests esptool
- name: Cache pip
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-

- name: Install PlatformIO Core
run: |
pip install platformio
if [[ "${{ github.ref_type }}" == "tag" ]]; then
version=${{ github.ref_name }}
else
version="${GITHUB_SHA::7}"
fi

sed -i "s/-DBRUCE_VERSION=/-DBRUCE_VERSION='\"$version\"' ; /g" ./platformio.ini
sed -i "s/-DGIT_COMMIT_HASH='\"Homebrew\"'/\!echo '-DGIT_COMMIT_HASH=\\\\\\\\\"'\$\(git describe --always --dirty)'\\\\\\\\\"'/g" ./platformio.ini

cat ./platformio.ini
- name: Cache PlatformIO
uses: actions/cache@v4
with:
path: |
~/.platformio
key: Bruce-platformio-${{ hashFiles('**/platformio.ini') }}
restore-keys: Bruce-platformio-

- name: Run Compile
run: |
platformio run -e ${{ matrix.board.env }}
- name: Restore PIO
uses: actions/cache/restore@v4
with:
path: |
${{ github.workspace }}/.pio
key: Bruce-pio-${{ matrix.board.env }}-${{ github.run_id }}-${{ github.run_attempt }}
restore-keys: |
Bruce-pio-${{ matrix.board.env }}-

- name: Merge Files
run: |
esptool.py --chip esp32s3 merge_bin -o Bruce-${{ matrix.board.env }}.bin \
${{ matrix.board.partitions.bootloader_addr }} .pio/build/${{ matrix.board.env }}/bootloader.bin \
0x8000 .pio/build/${{ matrix.board.env }}/partitions.bin \
0x10000 .pio/build/${{ matrix.board.env }}/firmware.bin
- name: Install PlatformIO Core
run: |
pip install platformio
if [[ "${{ github.ref_type }}" == "tag" ]]; then
version=${{ github.ref_name }}
else
version="${GITHUB_SHA::7}"
fi

- name: Upload ${{ matrix.board.name }}
uses: actions/upload-artifact@v4
with:
name: Bruce-${{ matrix.board.env }}
path: Bruce-*.bin
retention-days: 5
if-no-files-found: error
sed -i "s/-DBRUCE_VERSION=/-DBRUCE_VERSION='\"$version\"' ; /g" ./platformio.ini
sed -i "s/-DGIT_COMMIT_HASH='\"Homebrew\"'/\!echo '-DGIT_COMMIT_HASH=\\\\\\\\\"'\$\(git describe --always --dirty)'\\\\\\\\\"'/g" ./platformio.ini

cat ./platformio.ini

- name: Run Compile
run: |
platformio run -e ${{ matrix.board.env }}

- name: Cache PIO
uses: actions/cache/save@v4
with:
path: |
${{ github.workspace }}/.pio
key: Bruce-pio-${{ matrix.board.env }}-${{ github.run_id }}-${{ github.run_attempt }}

- name: Merge Files
run: |
pio run -e ${{ matrix.board.env }} -t build-firmware

- name: Upload ${{ matrix.board.name }}
uses: actions/upload-artifact@v4
with:
name: Bruce-${{ matrix.board.env }}
path: Bruce-*.bin
retention-days: 5
if-no-files-found: error
Loading
Loading