|
13 | 13 | runs-on: "ubuntu-latest" |
14 | 14 | strategy: |
15 | 15 | matrix: |
16 | | - target-platform: [ATARI, ADAM, APPLE, ATARI-8mb, IEC-LOLIN-D32, IEC-FUJIAPL] |
| 16 | + target-platform: [ATARI, ATARI-8mb, ADAM, APPLE, IEC-LOLIN-D32] |
17 | 17 |
|
18 | 18 | steps: |
19 | 19 | - name: Checkout Source |
@@ -58,24 +58,19 @@ jobs: |
58 | 58 | run: pip show platformio |
59 | 59 |
|
60 | 60 | - name: Create PlatformIO INI for Build |
61 | | - run: cp /home/runner/work/fujinet-firmware/fujinet-firmware/.github/workflows/platformio.ini.${{ matrix.target-platform }} /home/runner/work/fujinet-firmware/fujinet-firmware/platformio.ini |
| 61 | + run: cd /home/runner/work/fujinet-firmware/fujinet-firmware && /usr/bin/bash ./build.sh -l /home/runner/work/fujinet-firmware/fujinet-firmware/.github/workflows/platformio.release-${{ matrix.target-platform }}.ini -i /home/runner/work/fujinet-firmware/fujinet-firmware/platformio-generated.ini |
62 | 62 |
|
63 | 63 | - name: Show platformio.ini |
64 | | - run: cat /home/runner/work/fujinet-firmware/fujinet-firmware/platformio.ini |
| 64 | + run: cat /home/runner/work/fujinet-firmware/fujinet-firmware/platformio-generated.ini |
65 | 65 |
|
66 | 66 | - name: Get PIO build_board from INI |
67 | 67 | id: build_board |
68 | 68 | shell: bash |
69 | 69 | run: | |
70 | | - echo "NAME=$(grep '^[^;]*build_board ' /home/runner/work/fujinet-firmware/fujinet-firmware/.github/workflows/platformio.ini.${{ matrix.target-platform }} | sed s'/ //'g | cut -d "=" -f 2 | cut -d ";" -f 1)" >> $GITHUB_OUTPUT |
| 70 | + echo "NAME=$(grep '^[^;]*build_board ' /home/runner/work/fujinet-firmware/fujinet-firmware/platformio-generated.ini | sed s'/ //'g | cut -d "=" -f 2 | cut -d ";" -f 1)" >> $GITHUB_OUTPUT |
71 | 71 |
|
72 | | - # Build filesystem first so spiffs.bin is available during firmware build |
73 | | - - name: Build Filesystem |
74 | | - run: pio run -t buildfs -e ${{ steps.build_board.outputs.NAME }} |
75 | | - |
76 | | - # Build the firmware |
77 | | - - name: Build Firimware |
78 | | - run: pio run -e ${{ steps.build_board.outputs.NAME }} |
| 72 | + - name: Build release |
| 73 | + run: cd /home/runner/work/fujinet-firmware/fujinet-firmware && /usr/bin/bash ./build.sh -z -l /home/runner/work/fujinet-firmware/fujinet-firmware/.github/workflows/platformio.release-${{ matrix.target-platform }}.ini -i /home/runner/work/fujinet-firmware/fujinet-firmware/platformio-generated.ini |
79 | 74 |
|
80 | 75 | - name: Get version number from release.json |
81 | 76 | id: release-ver |
|
90 | 85 | - name: Rename firmware file if needed |
91 | 86 | shell: bash |
92 | 87 | run: | |
93 | | - mv firmware/fujinet-${{ matrix.target-platform }}-${{ steps.release-ver.outputs.VERSION }}.zip firmware/fujinet-${{ matrix.target-platform }}-${{ github.ref_name }}.zip |
| 88 | + mv firmware/fujinet-*.zip firmware/fujinet-${{ matrix.target-platform }}-${{ github.ref_name }}.zip |
94 | 89 |
|
95 | 90 | - name: Fetch Tag Info |
96 | 91 | run: git fetch --tags --force |
|
0 commit comments