Skip to content

Commit

Permalink
Edit CI
Browse files Browse the repository at this point in the history
  • Loading branch information
suchmememanyskill committed Feb 7, 2024
1 parent f985813 commit 82b1d51
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 14 deletions.
18 changes: 4 additions & 14 deletions .github/workflows/compile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,17 @@ jobs:

- name: Build PlatformIO Project
run: |
cd CYD-Klipper
pio run
- name: Make output dir
run: |
mkdir -p output
python3 ci.py
- name: Build Binary
- name: Copy output to site
run: |
cp ./CYD-Klipper/.pio/build/esp32dev/bootloader.bin output
cp ./CYD-Klipper/.pio/build/esp32dev/partitions.bin output
cp ./CYD-Klipper/.pio/build/esp32dev/firmware.bin output
cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin output
python3 -m esptool --chip esp32 merge_bin -o ./output/merged-firmware.bin --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 ./output/bootloader.bin 0x8000 ./output/partitions.bin 0xe000 ./output/boot_app0.bin 0x10000 ./output/firmware.bin
cp -r ./output ./_site
cp -r ./out ./_site
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: firmware
path: ./output
path: ./out

- name: Upload GitHub Page Artifact
uses: actions/upload-pages-artifact@v2
Expand Down
23 changes: 23 additions & 0 deletions ci.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import subprocess, os, shutil

CYD_PORTS = ["esp32-3248S035C", "esp32-2432S028R"]
BASE_DIR = os.getcwd()
PYTHON3 = "py" if os.name == "nt" else "python3"


if os.path.exists("out"):
shutil.rmtree("out")

for port in CYD_PORTS:
port_path = os.path.join("out", port)
os.chdir(BASE_DIR)
os.makedirs(port_path, exist_ok=True)
os.chdir("CYD-Klipper")
subprocess.run(["pio", "run", "-e", port], check=True)
os.chdir("..")
for file in ["bootloader.bin", "partitions.bin", "firmware.bin"]:
shutil.copy(f"./CYD-Klipper/.pio/build/{port}/{file}", f"{port_path}/{file}")

shutil.copy(os.path.join(os.path.expanduser("~"), ".platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin"), f"{port_path}/boot_app0.bin")
os.chdir(port_path)
subprocess.run([PYTHON3, "-m", "esptool", "--chip", "esp32", "merge_bin", "-o", "merged_firmware.bin", "--flash_mode", "dio", "--flash_freq", "40m", "--flash_size", "4MB", "0x1000", "bootloader.bin", "0x8000", "partitions.bin", "0xe000", "boot_app0.bin", "0x10000", "firmware.bin"], check=True)

0 comments on commit 82b1d51

Please sign in to comment.