Revert "Consolidate variant build steps (#4806)" (#4816)

This reverts commit 9f8d86cb25.

.github/actions/build-variant/action.yml

@@ -1,97 +0,0 @@
-name: Setup Build Variant Composite Action
-description: Variant build actions for Meshtastic Platform IO steps
-
-inputs:
-  board:
-    description: The board to build for
-    required: true
-  github_token:
-    description: GitHub token
-    required: true
-  build-script-path:
-    description: Path to the build script
-    required: true
-  remove-debug-flags:
-    description: A newline separated list of files to remove debug flags from
-    required: false
-    default: ""
-  ota-firmware-source:
-    description: The OTA firmware file to pull
-    required: false
-    default: ""
-  ota-firmware-target:
-    description: The target path to store the OTA firmware file
-    required: false
-    default: ""
-  artifact-paths:
-    description: A newline separated list of paths to store as artifacts
-    required: false
-    default: ""
-  include-web-ui:
-    description: Include the web UI in the build
-    required: false
-    default: "false"
-
-runs:
-  using: composite
-  steps:
-    - uses: actions/checkout@v4
-
-    - name: Build base
-      id: base
-      uses: ./.github/actions/setup-base
-
-    - name: Pull web ui
-      if: ${{ inputs.include-web-ui == "true" }}
-      uses: dsaltares/fetch-gh-release-asset@master
-      with:
-        repo: meshtastic/web
-        file: build.tar
-        target: build.tar
-        token: ${{ inputs.github_token }}
-
-    - name: Unpack web ui
-      if: ${{ inputs.include-web-ui == "true" }}
-      shell: bash
-      run: |
-        tar -xf build.tar -C data/static
-        rm build.tar
-
-    - name: Remove debug flags for release
-      shell: bash
-      if: ${{ inputs.remove-debug-flags != "" }}
-      run: |
-        for PATH in ${{ inputs.remove-debug-flags }}; do
-          sed -i '/DDEBUG_HEAP/d' ${PATH}
-        done
-
-    - name: Build ${{ inputs.board }}
-      shell: bash
-      run: ${{ inputs.build-script-path }} ${{ inputs.board }}
-
-    - name: Pull OTA Firmware
-      if: ${{ inputs.ota-firmware-source != "" && inputs.ota-firmware-target != "" }}
-      uses: dsaltares/fetch-gh-release-asset@master
-      with:
-        repo: meshtastic/firmware-ota
-        file: ${{ inputs.ota-firmware-source }}
-        target: ${{ inputs.ota-firmware-target }}
-        token: ${{ inputs.github_token }}
-
-    - name: Get release version string
-      shell: bash
-      run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-      id: version
-
-    - name: Store binaries as an artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
-        overwrite: true
-        path: |
-          ${{ inputs.artifact-paths }}
-
-    - name: Clean up resources
-      shell: bash
-      run: |
-        rm -rf .

.github/workflows/build_esp32.yml

@@ -11,21 +11,53 @@ jobs:
   build-esp32:
     runs-on: ubuntu-latest
     steps:
-      - name: Build ESP32
+      - uses: actions/checkout@v4
-        id: build
+      - name: Build base
-        uses: ./.github/actions/build-variant
+        id: base
+        uses: ./.github/actions/setup-base
+
+      - name: Pull web ui
+        uses: dsaltares/fetch-gh-release-asset@master
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          repo: meshtastic/web
-          board: ${{ inputs.board }}
+          file: build.tar
-          remove-debug-flags: |
+          target: build.tar
-            ./arch/esp32/esp32.ini
+          token: ${{ secrets.GITHUB_TOKEN }}
-            ./arch/esp32/esp32s2.ini
+
-            ./arch/esp32/esp32s3.ini
+      - name: Unpack web ui
-            ./arch/esp32/esp32c3.ini
+        run: |
-          build-script-path: bin/build-esp32.sh
+          tar -xf build.tar -C data/static
-          ota-firmware-source: firmware.bin
+          rm build.tar
-          ota-firmware-target: release/bleota.bin
+
-          artifact-paths: |
+      - name: Remove debug flags for release
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: |
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32s2.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32s3.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32c3.ini
+
+      - name: Build ESP32
+        run: bin/build-esp32.sh ${{ inputs.board }}
+
+      - name: Pull OTA Firmware
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: meshtastic/firmware-ota
+          file: firmware.bin
+          target: release/bleota.bin
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get release version string
+        shell: bash
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
+          overwrite: true
+          path: |
             release/*.bin
             release/*.elf
-          include-web-ui: true

.github/workflows/build_esp32_c3.yml

@@ -13,20 +13,51 @@ jobs:
   build-esp32-c3:
     runs-on: ubuntu-latest
     steps:
-      - name: Build ESP32-C3
+      - uses: actions/checkout@v4
-        id: build
+      - name: Build base
-        uses: ./.github/actions/build-variant
+        id: base
+        uses: ./.github/actions/setup-base
+
+      - name: Pull web ui
+        uses: dsaltares/fetch-gh-release-asset@master
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          repo: meshtastic/web
-          board: ${{ inputs.board }}
+          file: build.tar
-          remove-debug-flags: |
+          target: build.tar
-            ./arch/esp32/esp32.ini
+          token: ${{ secrets.GITHUB_TOKEN }}
-            ./arch/esp32/esp32s2.ini
+
-            ./arch/esp32/esp32s3.ini
+      - name: Unpack web ui
-            ./arch/esp32/esp32c3.ini
+        run: |
-          build-script-path: bin/build-esp32.sh
+          tar -xf build.tar -C data/static
-          ota-firmware-source: firmware-c3.bin
+          rm build.tar
-          ota-firmware-target: release/bleota-c3.bin
+      - name: Remove debug flags for release
-          artifact-paths: |
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: |
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32s2.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32s3.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32c3.ini
+      - name: Build ESP32
+        run: bin/build-esp32.sh ${{ inputs.board }}
+
+      - name: Pull OTA Firmware
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: meshtastic/firmware-ota
+          file: firmware-c3.bin
+          target: release/bleota-c3.bin
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get release version string
+        shell: bash
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
+          overwrite: true
+          path: |
             release/*.bin
             release/*.elf

.github/workflows/build_esp32_s3.yml

@@ -11,21 +11,51 @@ jobs:
   build-esp32-s3:
     runs-on: ubuntu-latest
     steps:
-      - name: Build ESP32-S3
+      - uses: actions/checkout@v4
-        id: build
+      - name: Build base
-        uses: ./.github/actions/build-variant
+        id: base
+        uses: ./.github/actions/setup-base
+
+      - name: Pull web ui
+        uses: dsaltares/fetch-gh-release-asset@master
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          repo: meshtastic/web
-          board: ${{ inputs.board }}
+          file: build.tar
-          remove-debug-flags: |
+          target: build.tar
-            ./arch/esp32/esp32.ini
+          token: ${{ secrets.GITHUB_TOKEN }}
-            ./arch/esp32/esp32s2.ini
+
-            ./arch/esp32/esp32s3.ini
+      - name: Unpack web ui
-            ./arch/esp32/esp32c3.ini
+        run: |
-          build-script-path: bin/build-esp32.sh
+          tar -xf build.tar -C data/static
-          ota-firmware-source: firmware-s3.bin
+          rm build.tar
-          ota-firmware-target: release/bleota-s3.bin
+      - name: Remove debug flags for release
-          artifact-paths: |
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: |
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32s2.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32s3.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32c3.ini
+      - name: Build ESP32
+        run: bin/build-esp32.sh ${{ inputs.board }}
+
+      - name: Pull OTA Firmware
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: meshtastic/firmware-ota
+          file: firmware-s3.bin
+          target: release/bleota-s3.bin
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get release version string
+        shell: bash
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
+          overwrite: true
+          path: |
             release/*.bin
             release/*.elf
-          include-web-ui: true

.github/workflows/build_nrf52.yml

@@ -11,14 +11,24 @@ jobs:
   build-nrf52:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
+      - name: Build base
+        id: base
+        uses: ./.github/actions/setup-base
+
       - name: Build NRF52
-        id: build
+        run: bin/build-nrf52.sh ${{ inputs.board }}
-        uses: ./.github/actions/build-variant
+
+      - name: Get release version string
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
-          board: ${{ inputs.board }}
+          overwrite: true
-          build-script-path: bin/build-nrf52.sh
+          path: |
-          artifact-paths: |
             release/*.hex
             release/*.uf2
             release/*.elf

.github/workflows/build_rpi2040.yml

@@ -11,13 +11,23 @@ jobs:
   build-rpi2040:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
+      - name: Build base
+        id: base
+        uses: ./.github/actions/setup-base
+
       - name: Build Raspberry Pi 2040
-        id: build
+        run: ./bin/build-rpi2040.sh ${{ inputs.board }}
-        uses: ./.github/actions/build-variant
+
+      - name: Get release version string
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
-          board: ${{ inputs.board }}
+          overwrite: true
-          build-script-path: bin/build-rpi2040.sh
+          path: |
-          artifact-paths: |
             release/*.uf2
             release/*.elf

.github/workflows/build_stm32.yml

@@ -11,13 +11,23 @@ jobs:
   build-stm32:
     runs-on: ubuntu-latest
     steps:
-      - name: Build Raspberry Pi 2040
+      - uses: actions/checkout@v4
-        id: build
+      - name: Build base
-        uses: ./.github/actions/build-variant
+        id: base
+        uses: ./.github/actions/setup-base
+
+      - name: Build STM32
+        run: bin/build-stm32.sh ${{ inputs.board }}
+
+      - name: Get release version string
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
-          board: ${{ inputs.board }}
+          overwrite: true
-          build-script-path: bin/build-stm32.sh
+          path: |
-          artifact-paths: |
             release/*.hex
             release/*.bin