pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(ci): Replace workflow set-output with environment variables

Browse source 
* Needed for deprecation: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
This commit is contained in:
Albert Y 2022-10-22 12:50:44 +08:00 committed by GitHub
parent d3d5b8eb8a
commit b90e3ae03d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
.github/workflows/build-user-config.yml vendored
View file

@ -18,8 +18,8 @@ on:
default: "bin" default: "bin"
required: false required: false
type: string type: string
artifact_name: archive_name:
description: 'Artifact output file name' description: 'Archive output file name'
default: 'firmware' default: 'firmware'
required: false required: false
type: string type: string
@ -29,21 +29,18 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Fetch Build Keyboards name: Fetch Build Keyboards
outputs: outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }} build_matrix: ${{ env.build_matrix }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3.1.0
- name: Install yaml2json - name: Install yaml2json
run: python3 -m pip install remarshal run: python3 -m pip install remarshal
- name: Fetch Build Matrix - name: Fetch Build Matrix
id: set-matrix
run: | run: |
set -x echo "build_matrix=$(yaml2json ${{ inputs.build_matrix_path }} | jq -c .)" >> $GITHUB_ENV
matrix=$(yaml2json ${{ inputs.build_matrix_path }} | jq -c .) yaml2json ${{ inputs.build_matrix_path }} | jq
yaml2json ${{ inputs.build_matrix_path }}
echo "::set-output name=matrix::${matrix}"
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -53,35 +50,31 @@ jobs:
name: Build name: Build
strategy: strategy:
fail-fast: false fail-fast: false
matrix: ${{fromJson(needs.matrix.outputs.matrix)}} matrix: ${{ fromJson(needs.matrix.outputs.build_matrix) }}
steps: steps:
- name: Prepare variables - name: Prepare variables
id: variables shell: sh -x {0}
run: | run: |
set -x
if [ -n "${{ matrix.shield }}" ] if [ -n "${{ matrix.shield }}" ]
then then
EXTRA_CMAKE_ARGS="-DSHIELD=\"${{ matrix.shield }}\"" echo "extra_cmake_args=-DSHIELD=\"${{ matrix.shield }}\"" >> $GITHUB_ENV
ARTIFACT_NAME="${{ matrix.shield }}-${{ matrix.board }}-zmk" echo "artifact_name=${{ matrix.shield }}-${{ matrix.board }}-zmk" >> $GITHUB_ENV
DISPLAY_NAME="${{ matrix.shield }} - ${{ matrix.board }}" echo "display_name=${{ matrix.shield }} - ${{ matrix.board }}" >> $GITHUB_ENV
else else
EXTRA_CMAKE_ARGS= echo "extra_cmake_args=" >> $GITHUB_ENV
DISPLAY_NAME="${{ matrix.board }}" echo "artifact_name=${{ matrix.board }}-zmk" >> $GITHUB_ENV
ARTIFACT_NAME="${{ matrix.board }}-zmk" echo "display_name=${{ matrix.board }}" >> $GITHUB_ENV
fi fi
echo ::set-output name=extra-cmake-args::${EXTRA_CMAKE_ARGS} echo "zephyr_version=${ZEPHYR_VERSION}" >> $GITHUB_ENV
echo ::set-output name=artifact-name::${ARTIFACT_NAME}
echo ::set-output name=display-name::${DISPLAY_NAME}
echo ::set-output name=zephyr-version::${ZEPHYR_VERSION}
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3.1.0
- name: Cache west modules - name: Cache west modules
uses: actions/cache@v3.0.2 uses: actions/cache@v3.0.11
continue-on-error: true continue-on-error: true
env: env:
cache-name: cache-zephyr-${{ steps.variables.outputs.zephyr-version }}-modules cache_name: cache-zephyr-${{ env.zephyr_version }}-modules
with: with:
path: | path: |
modules/ modules/
@ -89,9 +82,9 @@ jobs:
zephyr/ zephyr/
bootloader/ bootloader/
zmk/ zmk/
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/west.yml', '**/build.yaml') }} key: ${{ runner.os }}-build-${{ env.cache_name }}-${{ hashFiles('**/west.yml', '**/build.yaml') }}
restore-keys: | restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build-${{ env.cache_name }}-
${{ runner.os }}-build- ${{ runner.os }}-build-
${{ runner.os }}- ${{ runner.os }}-
@ -104,28 +97,28 @@ jobs:
- name: West Zephyr export - name: West Zephyr export
run: west zephyr-export run: west zephyr-export
- name: West Build (${{ steps.variables.outputs.display-name }}) - name: West Build (${{ env.display_name }})
shell: sh -x {0}
run: | run: |
set -x west build -s zmk/app -b ${{ matrix.board }} -- -DZMK_CONFIG=${GITHUB_WORKSPACE}/${{ inputs.config_path }} ${{ env.extra_cmake_args }} ${{ matrix.cmake-args }}
west build -s zmk/app -b ${{ matrix.board }} -- -DZMK_CONFIG=${GITHUB_WORKSPACE}/${{ inputs.config_path }} ${{ steps.variables.outputs.extra-cmake-args }} ${{ matrix.cmake-args }}
- name: ${{ steps.variables.outputs.display-name }} Kconfig file - name: ${{ env.display_name }} Kconfig file
run: grep -v -e "^#" -e "^$" build/zephyr/.config | sort run: grep -v -e "^#" -e "^$" build/zephyr/.config | sort
- name: Rename artifacts - name: Rename artifacts
shell: sh -x {0}
run: | run: |
set -x
mkdir build/artifacts mkdir build/artifacts
if [ -f build/zephyr/zmk.uf2 ] if [ -f build/zephyr/zmk.uf2 ]
then then
cp build/zephyr/zmk.uf2 "build/artifacts/${{ steps.variables.outputs.artifact-name }}.uf2" cp build/zephyr/zmk.uf2 "build/artifacts/${{ env.artifact_name }}.uf2"
elif [ -f build/zephyr/zmk.${{ inputs.fallback_binary }} ] elif [ -f build/zephyr/zmk.${{ inputs.fallback_binary }} ]
then then
cp build/zephyr/zmk.${{ inputs.fallback_binary }} "build/artifacts/${{ steps.variables.outputs.artifact-name }}.${{ inputs.fallback_binary }}" cp build/zephyr/zmk.${{ inputs.fallback_binary }} "build/artifacts/${{ env.artifact_name }}.${{ inputs.fallback_binary }}"
fi fi
- name: Archive (${{ steps.variables.outputs.display-name }}) - name: Archive (${{ env.display_name }})
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: ${{ inputs.artifact_name }} name: ${{ inputs.archive_name }}
path: build/artifacts path: build/artifacts