Skip to content

Commit

Permalink
fix(build): Properly west init new tmp dir.
Browse files Browse the repository at this point in the history
  • Loading branch information
petejohanson committed Nov 25, 2023
1 parent 202012f commit a566f31
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/build-user-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ jobs:
shield: ${{ matrix.shield }}
artifact_name: ${{ matrix.artifact-name }}
run: |
echo "tmp_dir=$(mktemp -d)" >> $GITHUB_ENV
echo "tmp_config_dir=${{ env.tmp_dir }}/config/" >> $GITHUB_ENV
export new_tmp_dir=$(mktemp -d)
echo "tmp_dir=${new_tmp_dir}" >> $GITHUB_ENV
echo "tmp_config_dir=${new_tmp_dir}/config" >> $GITHUB_ENV
if [ -e zephyr/module.yml ]; then
export zmk_load_arg=" -DZMK_EXTRA_MODULES='${GITHUB_WORKSPACE}'"
fi
Expand All @@ -78,8 +79,9 @@ jobs:
echo "display_name=${shield:+$shield - }${board}" >> $GITHUB_ENV
echo "artifact_name=${artifact_name:-${shield:+$shield-}${board}-zmk}" >> $GITHUB_ENV
- name: Move config files to isolate temporary directory
run: mv ${{ input.config_path }}/* "${{ env.tmp_config_dir }}/""
- name: Copy config files to isolated temporary directory
run: cp -R ${{ inputs.config_path }}/* "${{ env.tmp_config_dir }}/"

- name: Cache west modules
uses: actions/[email protected]
continue-on-error: true
Expand All @@ -99,7 +101,7 @@ jobs:
${{ runner.os }}-
- name: West Init
run: west init -l "${{ inputs.config_path }}"
run: west init -l "${{ env.tmp_config_dir }}"

- name: West Update
run: west update
Expand Down

0 comments on commit a566f31

Please sign in to comment.