ClaytonWWilson/miryoku_zmk
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/miryoku_zmk.git synced 2025-12-15 18:38:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update actions/upload-artifact version

Browse Source 
- Simplify artifacts
This commit is contained in:
Manna Harbour 2024-04-10 17:38:36 +10:00
parent eea578d8d2
commit c450bb5d17
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
.github/workflows/main.yml vendored
View File

@ -90,7 +90,7 @@ jobs:
keyboard=${{ matrix.board }} keyboard=${{ matrix.board }}
shield="" shield=""
fi fi
echo "shield_arg=${SHIELD_ARG}" >> $GITHUB_OUTPUT echo "shield_arg=$SHIELD_ARG" >> $GITHUB_OUTPUT
keyboard_split="$keyboard" keyboard_split="$keyboard"
keyboard_base=`echo "$keyboard" | sed 's/_\(left\|right\)//'` keyboard_base=`echo "$keyboard" | sed 's/_\(left\|right\)//'`
@ -102,19 +102,19 @@ jobs:
cat "$configfile" >> "$tmpfile" cat "$configfile" >> "$tmpfile"
mv "$tmpfile" "$configfile" mv "$tmpfile" "$configfile"
artifact_build_name="miryoku_zmk" run_name="miryoku_zmk"
if [ -n "${{ matrix.shield }}" -a "${{ matrix.shield }}" != 'default' ] if [ -n "${{ matrix.shield }}" -a "${{ matrix.shield }}" != 'default' ]
then then
artifact_build_name="$artifact_build_name ${{ matrix.shield }}" run_name="$run_name ${{ matrix.shield }}"
fi fi
artifact_build_name="$artifact_build_name ${{ matrix.board }}" run_name="$run_name ${{ matrix.board }}"
hash_length=16 hash_length=8
if [ -n "${{ matrix.custom_config }}" -a "${{ matrix.custom_config }}" != 'default' ] if [ -n "${{ matrix.custom_config }}" -a "${{ matrix.custom_config }}" != 'default' ]
then then
echo "${{ matrix.custom_config }}" >> "$configfile" echo "${{ matrix.custom_config }}" >> "$configfile"
artifact_build_name="$artifact_build_name config_"`echo "${{ matrix.custom_config }}" | md5sum | head -c "$hash_length"` run_name="$run_name config_"`echo "${{ matrix.custom_config }}" | md5sum | head -c "$hash_length"`
fi fi
for option in "alphas_${{ matrix.alphas }}" "extra_${{ matrix.extra }}" "tap_${{ matrix.tap }}" "nav_${{ matrix.nav }}" "clipboard_${{ matrix.clipboard }}" "layers_${{ matrix.layers }}" "mapping_${{ matrix.mapping }}" for option in "alphas_${{ matrix.alphas }}" "extra_${{ matrix.extra }}" "tap_${{ matrix.tap }}" "nav_${{ matrix.nav }}" "clipboard_${{ matrix.clipboard }}" "layers_${{ matrix.layers }}" "mapping_${{ matrix.mapping }}"
@ -123,7 +123,7 @@ jobs:
*_ ) ;; *_ ) ;;
*_default ) ;; *_default ) ;;
* ) * )
artifact_build_name="$artifact_build_name $option" run_name="$run_name $option"
echo "#define MIRYOKU_"`echo "$option" | tr 'a-z' 'A-Z'` >> "$configfile" echo "#define MIRYOKU_"`echo "$option" | tr 'a-z' 'A-Z'` >> "$configfile"
;; ;;
esac esac
@ -134,30 +134,28 @@ jobs:
mkdir "$artifact_dir" mkdir "$artifact_dir"
test "$MIRYOKU_DEBUG" = 'MIRYOKU_DEBUG_TRUE' && cp "$configfile" "$artifact_dir" test "$MIRYOKU_DEBUG" = 'MIRYOKU_DEBUG_TRUE' && cp "$configfile" "$artifact_dir"
if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ] if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ]
then then
kconfig_file="${GITHUB_WORKSPACE}/miryoku_zmk/config/$keyboard_split.conf" kconfig_file="${GITHUB_WORKSPACE}/miryoku_zmk/config/$keyboard_split.conf"
echo "${{ matrix.kconfig }}" >> "$kconfig_file" echo "${{ matrix.kconfig }}" >> "$kconfig_file"
artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | head -c "$hash_length"` test "$MIRYOKU_DEBUG" = 'MIRYOKU_DEBUG_TRUE' && cp "$kconfig_file" "$artifact_dir"
run_name="$run_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | head -c "$hash_length"`
fi fi
test "$MIRYOKU_DEBUG" = 'MIRYOKU_DEBUG_TRUE' && test -f "$kconfig_file" && cp "$kconfig_file" "$artifact_dir"
if [ -n "${{ matrix.branches }}" -a "${{ matrix.branches }}" != 'default' ] if [ -n "${{ matrix.branches }}" -a "${{ matrix.branches }}" != 'default' ]
then then
artifact_build_name="$artifact_build_name branches_"`echo "${{ matrix.branches }}" | md5sum | head -c "$hash_length"` run_name="$run_name branches_"`echo "${{ matrix.branches }}" | md5sum | head -c "$hash_length"`
branches="${{ matrix.branches }}" branches="${{ matrix.branches }}"
fi fi
if [ -n "${{ matrix.modules }}" -a "${{ matrix.modules }}" != 'default' ] if [ -n "${{ matrix.modules }}" -a "${{ matrix.modules }}" != 'default' ]
then then
artifact_build_name="$artifact_build_name modules_"`echo "${{ matrix.modules }}" | md5sum | head -c "$hash_length"` run_name="$run_name modules_"`echo "${{ matrix.modules }}" | md5sum | head -c "$hash_length"`
modules="${{ matrix.modules }}" modules="${{ matrix.modules }}"
fi fi
artifact_build_name=`echo $artifact_build_name | tr ' ' '-'` run_name=`echo $run_name | tr ' ' '-'`
echo "artifact_build_name=$artifact_build_name" >> $GITHUB_OUTPUT echo "run_name=$run_name" >> $GITHUB_OUTPUT
artifact_generic_name=`echo "$artifact_build_name" | sed 's/_\(left\|right\)//'`
echo "artifact_generic_name=$artifact_generic_name" >> $GITHUB_OUTPUT
echo "::endgroup::" echo "::endgroup::"
@ -251,7 +249,6 @@ jobs:
echo "::endgroup::" echo "::endgroup::"
echo "::group::modules" echo "::group::modules"
for module in $modules for module in $modules
do do
user=`echo "$module" | cut -f 1 -d '/'` user=`echo "$module" | cut -f 1 -d '/'`
@ -272,7 +269,7 @@ jobs:
if [ -n "$module_dirs" ] if [ -n "$module_dirs" ]
then then
modules_arg="-DZMK_EXTRA_MODULES=\"$module_dirs\"" modules_arg="-DZMK_EXTRA_MODULES=\"$module_dirs\""
echo "modules_arg=${modules_arg}" >> $GITHUB_OUTPUT echo "modules_arg=$modules_arg" >> $GITHUB_OUTPUT
fi fi
echo "::endgroup::" echo "::endgroup::"
- name: cache - name: cache
@ -343,15 +340,15 @@ jobs:
file="${GITHUB_WORKSPACE}/zmk/app/build/zephyr/zmk.$extension" file="${GITHUB_WORKSPACE}/zmk/app/build/zephyr/zmk.$extension"
if [ -f "$file" ] if [ -f "$file" ]
then then
cp "$file" "${{ steps.main.outputs.artifact_dir }}/${{ steps.main.outputs.artifact_build_name }}.$extension" cp "$file" "${{ steps.main.outputs.artifact_dir }}"
test "$MIRYOKU_DEBUG" = 'MIRYOKU_DEBUG_TRUE' || break test "$MIRYOKU_DEBUG" = 'MIRYOKU_DEBUG_TRUE' || break
fi fi
done done
test "$MIRYOKU_DEBUG" = 'MIRYOKU_DEBUG_TRUE' && cp "${GITHUB_WORKSPACE}/zmk/app/build/zephyr/.config" "${{ steps.main.outputs.artifact_dir }}/${{ steps.main.outputs.artifact_build_name }}.config" test "$MIRYOKU_DEBUG" = 'MIRYOKU_DEBUG_TRUE' && cp "${GITHUB_WORKSPACE}/zmk/app/build/zephyr/.config" "${{ steps.main.outputs.artifact_dir }}"
echo "::endgroup::" echo "::endgroup::"
- name: upload - name: upload
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ steps.main.outputs.artifact_generic_name }} name: ${{ steps.main.outputs.run_name }}
path: ${{ steps.main.outputs.artifact_dir }} path: ${{ steps.main.outputs.artifact_dir }}