From a566f31dfd56c5a3b4b7a216b4835031182dbfe1 Mon Sep 17 00:00:00 2001 From: Peter Johanson Date: Sat, 25 Nov 2023 21:44:11 +0000 Subject: [PATCH] fix(build): Properly west init new tmp dir. --- .github/workflows/build-user-config.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-user-config.yml b/.github/workflows/build-user-config.yml index 7d97b8c9a14b..d424ee8a866d 100644 --- a/.github/workflows/build-user-config.yml +++ b/.github/workflows/build-user-config.yml @@ -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 @@ -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/cache@v3.0.11 continue-on-error: true @@ -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