Improve artifact merge

This commit is contained in:
Ben Lye 2024-02-21 18:08:03 +00:00
parent d09784e4a0
commit 417a8ebea1

View File

@ -42,28 +42,28 @@ jobs:
include:
- board: "multi4in1:avr:multiatmega328p:bootloader=none"
name: "ATmega328p"
artifact_name: "atmega328p-no-boot"
artifact_name: "atmega328p"
- board: "multi4in1:avr:multiatmega328p:bootloader=optiboot"
name: "ATmega328p (Optiboot)"
artifact_name: "atmega328p-no-optiboot"
artifact_name: "atmega328p-optiboot"
- board: "multi4in1:avr:multixmega32d4"
name: "OrangeRX"
artifact_name: "orangerx"
- board: "multi4in1:STM32F1:multistm32f103c8:debug_option=none"
name: "STM32F103 (64KB)"
artifact_name: "stm32-64k-no-debug"
artifact_name: "stm32f103-64k"
- board: "multi4in1:STM32F1:multistm32f103cb:debug_option=none"
name: "STM32F103 (128KB)"
artifact_name: "stm32-128k-no-debug"
artifact_name: "stm32f103-128k"
- board: "multi4in1:STM32F1:multistm32f103cb:debug_option=native"
name: "STM32F103 (128KB, USB Debugging)"
artifact_name: "stm32-128k-usb-debug"
artifact_name: "stm32f103-128k-usb-debug"
- board: "multi4in1:STM32F1:multistm32f103cb:debug_option=ftdi"
name: "STM32F103 (128KB, Serial Debugging)"
artifact_name: "stm32-128k-ftdi-debug"
artifact_name: "stm32f103-128k-serial-debug"
- board: "multi4in1:STM32F1:multi5in1t18int"
name: "T18 5-in-1 (128KB)"
artifact_name: "stm32-128k-t18"
artifact_name: "t18-5in1"
# Set the build name using the friendly board name
name: ${{ matrix.name }}
@ -233,10 +233,10 @@ jobs:
if: env.HAVE_FILES == 'true'
uses: actions/upload-artifact/@v4
with:
name: build-artifact-${{ matrix.artifact_name }}
name: multi-${{ matrix.artifact_name }}
path: ./binaries/
merge:
Merge:
runs-on: ubuntu-latest
needs: build
steps:
@ -245,3 +245,5 @@ jobs:
with:
name: multi-test-build
pattern: build-artifact-*
delete-merged: true
retention-days: 90