Skip to content

Commit 0b6543a

Browse files
committed
CI: Move build rename to tooling.
1 parent bd0b821 commit 0b6543a

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

.github/workflows/micropython.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
env:
2020
# MicroPython version will be contained in github.event.release.tag_name for releases
21-
RELEASE_FILE: ${{ matrix.name }}-${{ github.event.release.tag_name || github.sha }}-micropython
21+
CI_RELEASE_FILENAME: ${{ matrix.name }}-${{ github.event.release.tag_name || github.sha }}-micropython
2222
CI_PROJECT_ROOT: ${{ github.workspace }}/src-${{ github.sha }}
2323
CI_BUILD_ROOT: ${{ github.workspace }}
2424
CI_USE_ENV: 1
@@ -70,29 +70,28 @@ jobs:
7070
python3 -m venv "$CI_BUILD_ROOT/.dir2uf2"
7171
source "$CI_BUILD_ROOT/.dir2uf2/bin/activate"
7272
ci_cmake_build ${{ matrix.name }}
73-
mv "$CI_BUILD_ROOT/${{ matrix.name }}.uf2" "$CI_BUILD_ROOT/$RELEASE_FILE.uf2"
74-
mv "$CI_BUILD_ROOT/${{ matrix.name }}-with-filesystem.uf2" "$CI_BUILD_ROOT/$RELEASE_FILE-with-filesystem.uf2"
7573
7674
- name: "Artifacts: Upload .uf2"
7775
uses: actions/upload-artifact@v4
7876
with:
79-
name: ${{ env.RELEASE_FILE }}.uf2
80-
path: ${{ env.CI_BUILD_ROOT }}/${{ env.RELEASE_FILE }}.uf2
77+
name: ${{ env.CI_RELEASE_FILENAME }}.uf2
78+
path: ${{ env.CI_BUILD_ROOT }}/${{ env.CI_RELEASE_FILENAME }}.uf2
8179

8280
- name: "Artifacts: Upload .uf2 (With Filesystem)"
8381
uses: actions/upload-artifact@v4
8482
with:
85-
name: ${{ env.RELEASE_FILE }}-with-filesystem.uf2
86-
path: ${{ env.CI_BUILD_ROOT }}/${{ env.RELEASE_FILE }}-with-filesystem.uf2
83+
if-no-files-found: ignore
84+
name: ${{ env.CI_RELEASE_FILENAME }}-with-filesystem.uf2
85+
path: ${{ env.CI_BUILD_ROOT }}/${{ env.CI_RELEASE_FILENAME }}-with-filesystem.uf2
8786

8887
- name: "Release: Upload .uf2"
8988
if: github.event_name == 'release'
9089
uses: softprops/action-gh-release@v1
9190
with:
92-
files: ${{ env.CI_BUILD_ROOT }}/${{ env.RELEASE_FILE }}.uf2
91+
files: ${{ env.CI_BUILD_ROOT }}/${{ env.CI_RELEASE_FILENAME }}.uf2
9392

9493
- name: "Release: Upload .uf2 (With Filesystem)"
95-
if: github.event_name == 'release'
94+
if: ${{ github.event_name == 'release' && hashFiles('${{ env.CI_BUILD_ROOT }}/${{ env.CI_RELEASE_FILENAME }}-with-filesystem.uf2') != '' }}
9695
uses: softprops/action-gh-release@v1
9796
with:
98-
files: ${{ env.CI_BUILD_ROOT }}/${{ env.RELEASE_FILE }}-with-filesystem.uf2
97+
files: ${{ env.CI_BUILD_ROOT }}/${{ env.CI_RELEASE_FILENAME }}-with-filesystem.uf2

ci/micropython.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,16 @@ function ci_cmake_build {
118118
cmake --build $BUILD_DIR -j 2
119119
ccache --show-stats || true
120120

121-
log_inform "Copying .uf2 to $(pwd)/$BOARD.uf2"
122-
cp "$BUILD_DIR/firmware.uf2" $BOARD.uf2
121+
if [ -z ${CI_RELEASE_FILENAME+x} ]; then
122+
CI_RELEASE_FILENAME=$BOARD
123+
fi
124+
125+
log_inform "Copying .uf2 to $(pwd)/$CI_RELEASE_FILENAME.uf2"
126+
cp "$BUILD_DIR/firmware.uf2" $CI_RELEASE_FILENAME.uf2
123127

124128
if [ -f "$BUILD_DIR/firmware-with-filesystem.uf2" ]; then
125-
log_inform "Copying -with-filesystem .uf2 to $(pwd)/$BOARD-with-filesystem.uf2"
126-
cp "$BUILD_DIR/firmware-with-filesystem.uf2" $BOARD-with-filesystem.uf2
129+
log_inform "Copying -with-filesystem .uf2 to $(pwd)/$CI_RELEASE_FILENAME-with-filesystem.uf2"
130+
cp "$BUILD_DIR/firmware-with-filesystem.uf2" $CI_RELEASE_FILENAME-with-filesystem.uf2
127131
fi
128132
}
129133

0 commit comments

Comments
 (0)