From cb9fb8ddd420ff793d9a1c3a25a11964787f7945 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 17:29:09 +0100 Subject: [PATCH 01/11] Update actions/upload-artifact --- .github/workflows/wled-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index d9933bd330..3ac095727c 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -61,13 +61,13 @@ jobs: env: WLED_RELEASE: True run: pio run -e ${{ matrix.environment }} - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: firmware-${{ matrix.environment }} path: | build_output/firmware/*.bin build_output/firmware/*.gz - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: name: firmware-release From 908481a55ad054ffe54ce4a5db20ab61c32e6810 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 17:47:00 +0100 Subject: [PATCH 02/11] Tweak github caching --- .github/workflows/wled-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index 3ac095727c..236c569d55 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -51,6 +51,9 @@ jobs: with: path: ~/.platformio key: ${{ runner.os }}-${{ matrix.environment}}-${{ hashFiles('platformio.ini') }} + restore-keys: | + ${{ runner.os }}-${{ matrix.environment}} + - name: Set up Python uses: actions/setup-python@v4 with: From fff7a47ab54d0fa17dc7ff79f31366913317ddc4 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 17:53:49 +0100 Subject: [PATCH 03/11] Update actions/checkout action --- .github/workflows/wled-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index 236c569d55..bce567bc10 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -8,7 +8,7 @@ jobs: name: Gather Environments runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Cache pip uses: actions/cache@v3 with: @@ -38,7 +38,7 @@ jobs: matrix: environment: ${{ fromJSON(needs.get_default_envs.outputs.environments) }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Cache pip uses: actions/cache@v3 with: From ebbd06800e335fa569ee05e95ccd855ec7d4a9d3 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 17:55:12 +0100 Subject: [PATCH 04/11] Update actions/setup-python action --- .github/workflows/wled-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index bce567bc10..c57a4d9328 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -16,7 +16,7 @@ jobs: key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.9' - name: Install PlatformIO From dabda3a02c3994040cb46bd4e2c69f36b16ebef0 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 17:56:00 +0100 Subject: [PATCH 05/11] Update actions/cache action --- .github/workflows/wled-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index c57a4d9328..b9b77423a1 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} @@ -40,14 +40,14 @@ jobs: steps: - uses: actions/checkout@v4 - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - name: Cache PlatformIO - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.platformio key: ${{ runner.os }}-${{ matrix.environment}}-${{ hashFiles('platformio.ini') }} From 1e04f4bdb793514bd54bd88cf5e484056eb64c72 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 17:59:53 +0100 Subject: [PATCH 06/11] Update actions/setup-python action --- .github/workflows/wled-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index b9b77423a1..62cee507de 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -55,7 +55,7 @@ jobs: ${{ runner.os }}-${{ matrix.environment}} - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.9' - name: Install PlatformIO From d08b4a51fa842919e23328cc40b8150e371432bc Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 18:07:48 +0100 Subject: [PATCH 07/11] Fix artifact upload --- .github/workflows/wled-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index 62cee507de..dcd92b6c81 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -64,12 +64,13 @@ jobs: env: WLED_RELEASE: True run: pio run -e ${{ matrix.environment }} + - name: Rename Bin + run: mv .pio/build/${{ matrix.environment }}/firmware.bin firmware-${{ matrix.environment }}.bin - uses: actions/upload-artifact@v4 with: name: firmware-${{ matrix.environment }} path: | - build_output/firmware/*.bin - build_output/firmware/*.gz + .pio/build/${{ matrix.environment }}/firmware.bin - uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: From 3f674aeaa352223d7b82028006948a3d259c1b8d Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 18:11:31 +0100 Subject: [PATCH 08/11] Fix artifact upload --- .github/workflows/wled-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index dcd92b6c81..91f94d1bcf 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -65,12 +65,11 @@ jobs: WLED_RELEASE: True run: pio run -e ${{ matrix.environment }} - name: Rename Bin - run: mv .pio/build/${{ matrix.environment }}/firmware.bin firmware-${{ matrix.environment }}.bin + run: mv -v .pio/build/${{ matrix.environment }}/firmware.bin firmware-${{ matrix.environment }}.bin - uses: actions/upload-artifact@v4 with: name: firmware-${{ matrix.environment }} - path: | - .pio/build/${{ matrix.environment }}/firmware.bin + path: firmware-${{ matrix.environment }}.bin - uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: From 678243f5ca904648cce5ffd0cdb18377cfbf540d Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 18:23:30 +0100 Subject: [PATCH 09/11] Fix artifact upload --- .github/workflows/wled-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index 91f94d1bcf..e78c1c738b 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -73,7 +73,7 @@ jobs: - uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: - name: firmware-release + name: firmware-release-${{ matrix.environment }} path: build_output/release/*.bin release: name: Create Release From 163ba3aaf6a175e89c819c5d9e165787e7706a16 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 18:32:22 +0100 Subject: [PATCH 10/11] Update actions/download-artifct action --- .github/workflows/wled-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index e78c1c738b..829eeeca6a 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -81,7 +81,7 @@ jobs: needs: [get_default_envs, build] if: startsWith(github.ref, 'refs/tags/') steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4 with: name: firmware-release - name: Create draft release From 2276080c67d9ca705b2de0f87fd7c52f43077754 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 18:56:59 +0100 Subject: [PATCH 11/11] Fix artifact upload --- .github/workflows/wled-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index 829eeeca6a..e875ca18d1 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -83,7 +83,9 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: firmware-release + name: firmware-release-* + - name: List Artifacts + run: find ./ - name: Create draft release uses: softprops/action-gh-release@v1 with: