@@ -10,6 +10,8 @@ inputs:
1010 required : true
1111 kernel_dirname :
1212 required : true
13+ firmware_dirname :
14+ required : true
1315 cache_dir :
1416 required : true
1517 kas :
@@ -61,14 +63,14 @@ runs:
6163
6264 - uses : actions/upload-artifact@v4
6365 with :
64- name : buildchart-${{ inputs.distro_name }}${{ inputs.kernel_dirname }}-${{ inputs.machine }}
66+ name : buildchart-${{ inputs.distro_name }}${{ inputs.kernel_dirname }}${{ inputs.firmware_dirname }} -${{ inputs.machine }}
6567 path : |
6668 buildchart.svg
6769 buildchart-world.svg
6870
6971 - uses : actions/upload-artifact@v4
7072 with :
71- name : kas-build-${{ inputs.distro_name }}${{ inputs.kernel_dirname }}-${{ inputs.machine }}
73+ name : kas-build-${{ inputs.distro_name }}${{ inputs.kernel_dirname }}${{ inputs.firmware_dirname }} -${{ inputs.machine }}
7274 path : kas-build.yml
7375
7476 - name : Stage build artifacts for publishing
7880 # expects file to be relative to our PWD. deploy_dir is outside
7981 # that, so we move things around:
8082 deploy_dir=../kas/build/tmp/deploy/images/${{inputs.machine}}
81- uploads_dir=./uploads/${{ inputs.distro_name }}${{ inputs.kernel_dirname }}/${{ inputs.machine }}
83+ uploads_dir=./uploads/${{ inputs.distro_name }}${{ inputs.kernel_dirname }}${{ inputs.firmware_dirname }} /${{ inputs.machine }}
8284 mkdir -p $uploads_dir
8385 find $deploy_dir/ -maxdepth 1 -type f -exec cp {} $uploads_dir/ \;
8486 find $deploy_dir/ -maxdepth 1 -type l \( -name boot-*.img -o -name *.rootfs.ext4.gz -o -name *.rootfs.qcomflash.tar.gz \) -exec cp -d {} $uploads_dir/ \;
@@ -105,7 +107,11 @@ runs:
105107 if [ -n "${KERNEL_DIRNAME}" ]; then
106108 KERNEL_DIRNAME="_${KERNEL_DIRNAME}"
107109 fi
108- BUILDNAME="${{ inputs.machine }}_${{ inputs.distro_name }}${KERNEL_DIRNAME}"
110+ FIRMWARE_DIRNAME="${{ inputs.firmware_dirname }}"
111+ if [ -n "${FIRMWARE_DIRNAME}" ]; then
112+ FIRMWARE_DIRNAME="_${FIRMWARE_DIRNAME}"
113+ fi
114+ BUILDNAME="${{ inputs.machine }}_${{ inputs.distro_name }}${KERNEL_DIRNAME}${FIRMWARE_DIRNAME}"
109115 FILENAME="build-url_${BUILDNAME}"
110116 echo "${{ steps.upload_artifacts.outputs.url }}" > "${FILENAME}"
111117 echo "filename=${FILENAME}" >> $GITHUB_OUTPUT
0 commit comments