@@ -63,22 +63,13 @@ jobs:
6363 git_ref : " ${{ inputs.git_ref || github.head_ref || github.ref_name }}"
6464 secrets : inherit
6565
66- raspberrypi-4 :
66+ raspberrypi :
6767 if : ${{ inputs.sd-images || ( github.event_name != 'workflow_dispatch' && !startsWith(github.ref_name, 'docker-') ) }}
6868 uses : ./.github/workflows/build-sd-images.yml
6969 with :
7070 git_ref : " ${{ inputs.git_ref || github.head_ref || github.ref_name }}"
7171 board_id : rpi4b
72- board_name : RaspberryPi4
73- secrets : inherit
74-
75- raspberrypi-5 :
76- if : ${{ false && inputs.sd-images || ( github.event_name != 'workflow_dispatch' && !startsWith(github.ref_name, 'docker-') ) }}
77- uses : ./.github/workflows/build-sd-images.yml
78- with :
79- git_ref : " ${{ inputs.git_ref || github.head_ref || github.ref_name }}"
80- board_id : rpi5b
81- board_name : RaspberryPi5
72+ board_name : RaspberryPi 4+
8273 secrets : inherit
8374
8475 armbian-test-image :
@@ -216,31 +207,19 @@ jobs:
216207 artifact_file : " ${{ needs.lxd-arm64.outputs.lxc_artifact_file }}"
217208 dry_run : ${{ (!inputs.release && github.event_name == 'workflow_dispatch') || github.ref_type != 'tag' || !(github.ref_protected || startsWith(github.ref, 'refs/tags/v')) }}
218209
219- raspberrypi-4- release :
210+ raspberrypi-release :
220211 needs :
221- - raspberrypi-4
212+ - raspberrypi
222213 - github-release
223214 if : ${{ inputs.sd-images || github.event_name != 'workflow_dispatch' }}
224215 uses : ./.github/workflows/publish-image.yml
225216 with :
226217 git_ref : " ${{ inputs.git_ref || github.head_ref || github.ref_name }}"
227- artifact_id : " ${{ needs.raspberrypi-4 .outputs.artifact_name }}"
228- artifact_file : " ${{ needs.raspberrypi-4 .outputs.artifact_file }}"
218+ artifact_id : " ${{ needs.raspberrypi.outputs.artifact_name }}"
219+ artifact_file : " ${{ needs.raspberrypi.outputs.artifact_file }}"
229220 dry_run : ${{ (!inputs.release && github.event_name == 'workflow_dispatch') || github.ref_type != 'tag' || !(github.ref_protected || startsWith(github.ref, 'refs/tags/v')) }}
230221 secrets : inherit
231222
232- raspberrypi-5-release :
233- needs :
234- - raspberrypi-5
235- - github-release
236- if : ${{ inputs.sd-images || github.event_name != 'workflow_dispatch' }}
237- uses : ./.github/workflows/publish-image.yml
238- with :
239- git_ref : " ${{ inputs.git_ref || github.head_ref || github.ref_name }}"
240- artifact_id : " ${{ needs.raspberrypi-5.outputs.artifact_name }}"
241- artifact_file : " ${{ needs.raspberrypi-5.outputs.artifact_file }}"
242- dry_run : ${{ (!inputs.release && github.event_name == 'workflow_dispatch') || github.ref_type != 'tag' || !(github.ref_protected || startsWith(github.ref, 'refs/tags/v')) }}
243- secrets : inherit
244223 odroidxu4-release :
245224 needs :
246225 - odroidxu4
0 commit comments